Ingo Schommer
0b296b3665
Merge remote-tracking branch 'origin/3.1'
2014-06-15 22:50:35 +12:00
Damian Mooyman
3033d45498
Updated translation masters
2014-05-13 11:13:44 +12:00
Damian Mooyman
6a69134fb0
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:33:44 +12:00
Damian Mooyman
bae95805dd
Updated translation masters
2014-05-07 10:03:15 +12:00
Damian Mooyman
ecda66a1c4
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:39:47 +13:00
Damian Mooyman
755f4f1557
Updated translation master
2014-03-31 14:23:47 +13:00
Stig Lindqvist
1625d126c2
BUG Report admin don't listen to filters
...
It seems like filter params that are added to the url are added in a bad way
Currently
?0[name]=filters[ContentReviewOwnerID]&0[value]=1
Expected:
?filters[ContentReviewOwnerID]=1
2014-02-25 17:20:25 +13:00
Ingo Schommer
889e97e17d
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:56 +13:00
Ingo Schommer
ca37dc8e69
Updated translations
2014-02-18 11:50:04 +13:00
jean
5f2d78a2dc
FIX JS issue when enabling save buttons for when the content has changed. Current implementation triggers a 'Object is not a function' error. New implementation follows the same logic as in the onmatch function, and uses .button() as the function
2014-02-17 14:34:12 +13:00
axllent
c043d070f7
Fix typo in ONLYSELECTTWO alert
2014-01-14 13:40:06 +13:00
Ingo Schommer
07033548fc
Merge remote-tracking branch 'origin/3.1'
2013-12-19 20:22:26 +01:00
Ingo Schommer
e009d0ef3d
Merge pull request #912 from kinglozzer/cms-page-add-button-focus
...
FIX: Prevent "Add Page" button being stuck 'focussed'
2013-12-19 09:11:05 -08:00
Ingo Schommer
6f5d9927de
Updated translations
2013-12-19 18:05:19 +01:00
Loz Calver
0a0ea33f58
FIX: Prevent AssetAdmin duplicate confirmation for file deletion ( fixes silverstripe/silverstripe-framework#2639 )
2013-12-17 09:54:14 +00:00
Loz Calver
b964e870aa
FIX: Prevent "Add Page" button being stuck 'focussed'
2013-12-16 14:44:24 +00:00
Ingo Schommer
9ca336bea3
Merge remote-tracking branch 'origin/3.1'
2013-12-02 20:44:57 +01:00
Loz Calver
8f720406b5
Implement History.js logic for "Cancel" action
2013-11-22 12:46:03 +01:00
Andrew Short
e17fb17520
Merge branch '3.1'
...
Conflicts:
lang/es.yml
2013-11-11 18:24:03 +11:00
Ingo Schommer
b726180ab8
API JS i18n files with short locale names, generated by build task
...
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.
See https://github.com/silverstripe/silverstripe-buildtools/commit/b59f3858afd5c46219a42b04b2742c7d24
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
2013-10-25 01:26:57 +02:00
Ingo Schommer
0a1ffd3e1a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-10-20 13:51:19 +02:00
Dawid Cieszyński
69ae8a8fed
FIX Remove invalid single quote
2013-10-16 00:06:41 +02:00
Ingo Schommer
dd29936fee
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:10:20 +02:00
Simon Welsh
0c2514d13e
Calculate where to scroll to based off the position in the div
...
Also, only scroll if not currently visible.
2013-10-10 15:42:49 +13:00
Ingo Schommer
6a8de3090c
Updated Te Reo translations
2013-10-08 11:37:43 +02:00
Ingo Schommer
1a40994527
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
2013-10-06 19:07:52 +02:00
Shea Dawson
0d2d293c02
BUGFIX check if hints are defined for given pagetype before using. Fixes #861
2013-10-03 14:20:54 +13:00
Loz Calver
595a0375e7
Stop MenuTitle updating tree on change
...
If the MenuTitle is changed and the tree updates, not saving the
changes to the page leaves the tree with the new title instead of the
old, correct one (until a refresh). This also seems counter-intuitive
anyway - suggesting to users that their updated MenuTitle has been
saved before it actually has.
2013-10-02 12:53:03 +02:00
Ingo Schommer
26b086c3f7
Escape pl_PL.js ( fixes #859 )
2013-10-02 12:24:23 +02:00
Ingo Schommer
ef21906063
"add page" behaviour fixed to work with new FormField IDs ( #786 )
2013-08-28 11:10:32 +02:00
Ingo Schommer
c62f992dc3
Merge remote-tracking branch 'origin/3.1'
2013-08-22 13:56:28 +02:00
Ingo Schommer
010869a9b5
Merge pull request #828 from sheadawson/827-treescroll
...
CMS tree pane to scroll to the page being edited. Fixes #827
2013-08-20 13:32:22 -07:00
Ingo Schommer
c4e54fd7eb
Fixed fromDocument usage in .cms-tree
...
See https://github.com/silverstripe/silverstripe-cms/pull/823
2013-08-20 15:37:17 +02:00
Shea Dawson
bb86373ab9
CMS tree pane to scroll to the page being edited. Fixes #827
2013-08-19 11:18:37 +10:00
Naomi Guyer
a2a4957fa5
BUG: Context menu too long ( Fixes #811 )
...
Added javascript to add and remove classes on context sub menus, to
allow for multi column layout.
2013-08-07 13:46:40 +12:00
Ingo Schommer
c21c9cba0d
Merge remote-tracking branch 'origin/3.1'
2013-05-31 18:10:26 +02:00
Ingo Schommer
bd86ff848c
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
javascript/CMSMain.Tree.js
2013-05-31 17:53:05 +02:00
Matt Peel
3cc6485c14
Add default params to _t() calls to ensure if a translation isn't found, it falls back to a useful English string
2013-05-21 14:57:29 +12:00
Loz Calver
f51448ced4
FIX 'Add new' page button missing ParentID
...
Slight typo causing this. Also slightly amended how extra URL
parameters are tagged on to prevent &undefined being appended to URL
2013-05-14 15:38:07 +01:00
Sean Harvey
4f88dcbbfc
BUG ShowUnpublished checkbox with initial state not working
...
If ShowUnpublished checkbox initial state is checked, the history
doesn't show the unpublished versions up front. The user would need to
uncheck the box then check again, as only the change event would handle
the toggling of showing unpublished versions.
Moved the ShowUnpublished handler into a separate entwine class, and
run the same toggle code onmatch, as well as onchange.
2013-05-13 16:24:00 +12:00
Ingo Schommer
7ecf56490a
FIX URL concat in tree actions (broke with 'translatable' module)
2013-05-08 09:38:25 +02:00
Ingo Schommer
c0302bc24d
Merge remote-tracking branch 'origin/3.1'
2013-04-29 08:59:11 +02:00
jean
685b82a985
FIX #673 Do not prevent default browser behaviour when selecting page type on new page creation
2013-04-12 19:39:54 +12:00
Ingo Schommer
2227ed3629
Merge remote-tracking branch 'origin/3.1'
2013-04-11 11:26:24 +02:00
ARNHOE
7305aca95b
MINOR: added translation for children list and added tree translations
2013-04-10 10:54:09 +03:00
Ingo Schommer
d7435cde71
Merge pull request #676 from kinglozzer/urlsegmentfield-error-fix
...
Better error message when attempting to enter a blank URL Segment (fixes silverstripe/sapphire#1570 )
2013-04-08 07:58:49 -07:00
Simon Welsh
6482eeb137
Update pl_PL.js
2013-04-08 21:32:05 +12:00
jean
c18f3fe446
BUGFIX Use onadd instead of onmatch on cms-add-form when creating new page #673
2013-04-08 11:03:12 +12:00
wkulesza
125edeb12e
Update pl_PL.js
2013-04-06 22:00:05 +13:00
Loz Calver
ea446f2ade
Better error message when attempting to enter a blank URL Segment ( fixes silverstripe/silverstripe-cms#1570 )
2013-04-05 14:06:32 +01:00