Colin Kuskie
|
b30491f3a6
|
Merge commit '808a866c8b' into webgui8. 7.9.4 release point
Conflicts:
docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
docs/upgrades/upgrade_7.9.2-7.9.3.pl
lib/WebGUI.pm
lib/WebGUI/Asset/MapPoint.pm
lib/WebGUI/Asset/Wobject/Calendar.pm
lib/WebGUI/Asset/Wobject/Gallery.pm
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
lib/WebGUI/Asset/Wobject/WikiMaster.pm
lib/WebGUI/AssetClipboard.pm
lib/WebGUI/AssetVersioning.pm
lib/WebGUI/Auth.pm
t/Asset/Asset.t
|
2010-06-25 20:08:11 -07:00 |
|
Graham Knop
|
650918ed3f
|
remove left over upgrades
|
2010-06-11 23:39:05 -05:00 |
|
Colin Kuskie
|
112db57dd1
|
Change name of MapPoint property from state to region to avoid conflict with asset state. Add template i18n. Fixes bugs 11531, 11532
|
2010-04-20 16:59:31 -07:00 |
|
Doug Bell
|
e60c6fdc91
|
Merge remote branch 'spunky/rfe620'
Conflicts:
docs/changelog/7.x.x.txt
docs/upgrades/packages-7.9.3/root_import_gallery-templates_default-gallery-edit-album.wgpkg
|
2010-04-19 17:25:30 -05:00 |
|
kimd
|
dd72159db0
|
Added buttons to the GalleryAlbum edit view so users can rotate photos by 90 deg (RFE 620).
|
2010-04-19 22:24:09 +02:00 |
|
Colin Kuskie
|
55d2e510d6
|
Add top-level keywords, which allows for hierarchial categorization of wiki pages.
|
2010-04-16 20:46:55 -07:00 |
|
Colin Kuskie
|
7fe81165ed
|
Bug fixes, changes to default wikipage template for keyword pages, and template var clarifications.
|
2010-04-13 11:28:31 -07:00 |
|
Colin Kuskie
|
7390497e1f
|
Change how the locked flag is displayed, so that it isn't inline with the content, but just above it. Fixes bug #11520
|
2010-04-13 10:55:47 -07:00 |
|
Doug Bell
|
2023e9c41e
|
fixed JS comment in head tags. added credits
|
2010-04-07 11:54:09 -05:00 |
|
Doug Bell
|
eee547b0cc
|
Add drag'n'drop sorting to the Gallery Album Edit View (RFE 11007).
|
2010-04-07 11:54:09 -05:00 |
|