Commit Graph

3472 Commits

Author SHA1 Message Date
Sam Minnee
746ac59a01 Merge branch '3.0' 2012-08-28 16:55:28 +12:00
Sam Minnée
24b0e5dbad Merge pull request #185 from patbolo/bugfix/7819
FIX 7819
2012-08-27 21:52:49 -07:00
jean
62cfd871b6 FIX 7819 Check if the current folder ID is in the url before assuming the list should not filter by folder ID 2012-08-28 16:43:54 +12:00
Sam Minnée
149de5e703 Merge pull request #182 from ryanwachtl/url-segment-loading-indicator
BUG Visual cue that URLSegment is updating
2012-08-27 21:11:59 -07:00
Sam Minnée
d6aa388af9 Merge pull request #184 from silverstripe-rebelalliance/trac/7817
FIX Dont refer to framework module in config rules
2012-08-27 21:10:54 -07:00
Hamish Friedlander
2637e6d9b2 FIX Dont refer to framework module in config rules
Might be called sapphire instead, in which case routing rules
will end up in the wrong place
2012-08-28 15:46:33 +12:00
Hamish Friedlander
d45dd34db9 FIX VirtualPageTest failing on apps with no $db on Page
VirtualPageTest was adding fields to Page via a decorator, but Page might
not have any fields itself. This changed Page from not having a table
to having a table, which then caused a problem on tearDown
2012-08-28 15:13:57 +12:00
Hamish Friedlander
cbadd3ef9b FIX Config frag legacycmsroutes doesnt need to come after _everything_ 2012-08-28 13:55:49 +12:00
Ingo Schommer
62783c75a9 BUG Prevent overwriting of draft/live preview form fields
By renaming fields to "StageLink" and "LiveLink",
which means they don't get influenced by the model getters
on Form->loadDataFrom(). Its also a more accurate
name for the field value, since it contains a full (nested) URL
rather than just a segment. Only used internally, so no API change.
2012-08-27 18:20:56 +02:00
Ingo Schommer
11b85e988e Fixed "from"/"to" filter field widths
Removed ineffective FieldGroup->subfieldParam setting,
replaced with a specialised template, as well as a new "stacked" styling
(both added to framework codebase)
2012-08-27 16:15:41 +02:00
Ingo Schommer
e59aec3f6f BUG Redirect to edit view after page revert in CMS (fixes #7391) 2012-08-27 14:19:40 +02:00
Ingo Schommer
cd8c3a0245 NEW Re-added SilverStripeNavigator styling 2012-08-27 11:53:57 +02:00
Ingo Schommer
2024e54f6b Merge remote-tracking branch 'origin/3.0' 2012-08-27 09:26:16 +02:00
Ingo Schommer
9785dd9da1 Merge branch '3.0' 2012-08-27 00:13:41 +02:00
Ingo Schommer
8442ed0ecd i18n for report table title (see #7798) 2012-08-26 23:58:38 +02:00
Ingo Schommer
59546ccf11 Localized page name in "add page" dialog and dropdowns (see #7798) 2012-08-26 23:58:38 +02:00
Ingo Schommer
6b6dfaed7b Fixed i18n namespace for "Sync Files" 2012-08-26 23:58:38 +02:00
Ingo Schommer
d20eae4a50 Updated translations 2012-08-23 23:34:54 +02:00
Ingo Schommer
9c74e57826 Merge remote-tracking branch 'origin/translation-staging' 2012-08-23 23:32:16 +02:00
TeamCity
a467fdb1b8 MINOR Updated translations 2012-08-24 09:07:29 +12:00
Ingo Schommer
0ec269f1bd Merge branch '3.0-translation-compatibility-fixes' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-compatibility-fixes
Conflicts:
	code/controllers/CMSMain.php
2012-08-23 22:53:27 +02:00
TeamCity
5f2f14031e MINOR Updated translations 2012-08-24 07:08:10 +12:00
TeamCity
c1f92937dd MINOR Updated translations 2012-08-24 06:07:05 +12:00
TeamCity
e9aeebec39 MINOR Updated translations 2012-08-24 02:21:56 +12:00
TeamCity
c6dc5ea754 MINOR Updated translations 2012-08-23 23:18:44 +12:00
TeamCity
04daeda0d0 MINOR Updated translations 2012-08-23 22:06:48 +12:00
TeamCity
d727e5d326 MINOR Updated translations 2012-08-23 21:07:12 +12:00
Damian Mooyman
7807842eb1 FIXED: Additional issue where the add-page ajax parameters wouldu incorrectly concatenate additional query parameters into the add action url. Resolved by moving URL concatenation from view to controller where Controller::join_links is available 2012-08-21 15:50:03 +12:00
Ingo Schommer
0cb1c60a05 Merge remote-tracking branch 'origin/3.0' 2012-08-20 22:26:05 +02:00
Ingo Schommer
ac29b9e00f Merge branch '3.0' 2012-08-20 22:25:39 +02:00
Ingo Schommer
2e791abad2 Better i18n for "new page" label (fixes #7796)
Also using better standard name for auto generated
page names ("Page" instead of "Site Tree",  "Pages" instead of "Site Tres" [sic])
2012-08-20 22:25:18 +02:00
Ingo Schommer
e6e2ab4774 Updated translations 2012-08-20 22:01:46 +02:00
Ingo Schommer
e2dbad03b3 Merge remote-tracking branch 'origin/master' into translation-staging 2012-08-20 13:06:14 +02:00
Ingo Schommer
b98e069b6d Merge remote-tracking branch 'origin/3.0' 2012-08-20 10:14:03 +02:00
Sean Harvey
c019f22163 Fix notice when ErrorPage tries to create static error pages and can't write 2012-08-20 15:23:46 +12:00
TeamCity
e702acfb3b MINOR Updated translations 2012-08-19 09:07:04 +12:00
TeamCity
225e26f0f3 MINOR Updated translations 2012-08-18 11:07:06 +12:00
TeamCity
38b7994c06 MINOR Updated translations 2012-08-17 21:07:15 +12:00
Ryan Wachtl
5f9362e742 BUG Visual cue that URLSegment is updating
Added a loading class on .field.urlsegment to indicate that the URLSegment is updating its value, set before and after self.suggest().
2012-08-17 03:05:39 -05:00
TeamCity
1b8d8cd7cb MINOR Updated translations 2012-08-17 01:26:30 +12:00
TeamCity
c6fbe6b9b6 MINOR Updated translations 2012-08-16 20:07:50 +12:00
Ingo Schommer
2923e55c71 BUG Restrict URLSegment preview to editable fields
This fixes a bug where the Translatable module
would have a duplicate preview because it had
another ".urlsegment" field showing the value in its
original language.

See https://github.com/silverstripe/silverstripe-translatable/issues/43
2012-08-16 09:48:54 +02:00
Ingo Schommer
f5007a5536 Allow extension of "add" link in CMS
First use case is the "translatable" module
2012-08-16 09:29:51 +02:00
TeamCity
a2b0dc1df0 MINOR Updated translations 2012-08-16 01:37:55 +12:00
TeamCity
407f6a04b5 MINOR Updated translations 2012-08-15 21:07:15 +12:00
TeamCity
00967f0db4 MINOR Updated translations 2012-08-15 01:10:06 +12:00
TeamCity
2b49032eba MINOR Updated translations 2012-08-14 21:07:15 +12:00
TeamCity
0c9de1003e MINOR Updated translations 2012-08-14 20:07:50 +12:00
TeamCity
076a6f24ae MINOR Updated translations 2012-08-14 07:07:17 +12:00
TeamCity
1ed28435e2 MINOR Updated translations 2012-08-14 02:21:37 +12:00