Commit Graph

3714 Commits

Author SHA1 Message Date
TeamCity
0a8df0239a Merge remote branch 'origin/master' into translation-staging 2012-08-28 17:13:50 +12:00
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
TeamCity
8e51a5203e MINOR Updated translations 2012-08-28 13:07:40 +12:00
TeamCity
204b6f866d MINOR Updated translations 2012-08-28 07:07:31 +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
TeamCity
91bf41b90f MINOR Updated translations 2012-08-28 01:25:31 +12:00
Ingo Schommer
e59aec3f6f BUG Redirect to edit view after page revert in CMS (fixes #7391) 2012-08-27 14:19:40 +02:00
TeamCity
b0ae7f024a MINOR Updated translations 2012-08-28 00:08:26 +12:00
TeamCity
705302aa6a MINOR Updated translations 2012-08-27 22:07:11 +12:00
Ingo Schommer
cd8c3a0245 NEW Re-added SilverStripeNavigator styling 2012-08-27 11:53:57 +02:00
TeamCity
fe80ffce18 MINOR Updated translations 2012-08-27 21:06:56 +12:00
TeamCity
1378e389d1 MINOR Updated translations 2012-08-27 20:07:29 +12:00
Ingo Schommer
61fff19302 MINOR Updated translations master 2012-08-27 09:27:36 +02:00
Ingo Schommer
0dbbe04a4b Merge remote-tracking branch 'origin/master' into translation-staging 2012-08-27 09:27:27 +02:00
Ingo Schommer
2024e54f6b Merge remote-tracking branch 'origin/3.0' 2012-08-27 09:26:16 +02:00
TeamCity
a7652d33b4 MINOR Updated translations 2012-08-27 16:07:13 +12: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
TeamCity
4735c2418b MINOR Updated translations 2012-08-27 00:07:19 +12:00
TeamCity
48402c1ec9 MINOR Updated translations 2012-08-26 23:07:08 +12:00
TeamCity
2c4e3e0ed7 MINOR Updated translations 2012-08-26 03:06:53 +12:00
TeamCity
712d89105d MINOR Updated translations 2012-08-26 02:07:05 +12:00
TeamCity
1779e4d3a6 MINOR Updated translations 2012-08-26 01:07:18 +12:00
TeamCity
43224a248c MINOR Updated translations 2012-08-25 09:08:02 +12:00
TeamCity
eddaf26a4b MINOR Updated translations 2012-08-25 07:06:40 +12:00
TeamCity
0698923a70 MINOR Updated translations 2012-08-25 06:07:02 +12:00
TeamCity
49ed53ba91 MINOR Updated translations 2012-08-25 01:07:24 +12:00
TeamCity
44d0a2e646 MINOR Updated translations 2012-08-25 00:07:08 +12:00
TeamCity
0ae8c11da7 MINOR Updated translations 2012-08-24 21:07:16 +12:00
TeamCity
8e81612b12 MINOR Updated translations 2012-08-24 20:07:51 +12:00
TeamCity
d529df1087 MINOR Updated translations 2012-08-24 19:07:08 +12:00
TeamCity
5fb65b1918 MINOR Updated translations 2012-08-24 18:07:08 +12:00
TeamCity
e62e01dfa4 MINOR Updated translations 2012-08-24 10:08:25 +12: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