tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
5,055 Commits 29 Branches 403 Tags 28 MiB
18939157f0
Commit Graph

5055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
fa0c56e582 Merge 3.2 into 3.3 2016-08-15 18:50:59 +12:00
Damian Mooyman
629a849c79 Merge 3.2 into 3.3 
# Conflicts:
#	lang/cs.yml
#	lang/sk.yml
 2016-08-15 18:48:40 +12:00
Damian Mooyman
a6562dd574 Merge 3.1 into 3.2 
# Conflicts:
#	code/controllers/ReportAdmin.php
 2016-08-15 18:46:50 +12:00
Damian Mooyman
c2f21d0008 Merge 3.4.1 into 3.4 2016-08-15 18:37:50 +12:00
Damian Mooyman
0ffe5fa560 Merge 3.3.3 into 3.3 2016-08-15 18:36:11 +12:00
Damian Mooyman
49ccb10c9b Merge 3.2.5 into 3.2 2016-08-15 18:34:55 +12:00
Damian Mooyman
c58d358e50 Merge 3.1.20 into 3.1 2016-08-15 18:33:40 +12:00
Damian Mooyman
bffab11a54 Update translations 2016-08-15 18:27:31 +12:00
Damian Mooyman
2f78f43273 Update translations 2016-08-15 17:44:52 +12:00
Damian Mooyman
1b50d59aba Update translations 2016-08-15 17:02:07 +12:00
Damian Mooyman
312cfca3ca Update translations 2016-08-15 16:31:55 +12:00
Damian Mooyman
ef856185ab BUG Fix regression in FormField casting 2016-08-15 15:55:06 +12:00
Damian Mooyman
9f86315330 Update translations 2016-08-15 15:49:50 +12:00
Damian Mooyman
a6a9cd729f BUG Fix regression in FormField casting 2016-08-15 15:34:29 +12:00
Damian Mooyman
5ad8157655 BUG Fix regression in FormField casting 2016-08-15 15:32:22 +12:00
Damian Mooyman
95c640ae6b BUG Fix regression in FormField casting 2016-08-15 15:26:39 +12:00
Damian Mooyman
f8c2945c22 Update translations 2016-08-15 15:00:58 +12:00
Damian Mooyman
a5017e598c Update translations 2016-08-15 14:01:09 +12:00
Daniel Hensby
5f73d3454e [SS-2016-012] FIX Missing ACL check on ReportAdmin 
This issue exposed reports to users able to guess the URL of a Report that they were not allowed to view the report
 2016-08-15 13:26:14 +12:00
Damian Mooyman
4d17dcc799 Update translations 2016-08-15 13:12:49 +12:00
Daniel Hensby
095ae30a3e Merge pull request #1580 from open-sausages/pulls/4.0/old-template 
API remove obsolete template
 2016-08-12 12:26:41 +01:00
Damian Mooyman
90aff08df7 API remove obsolete template 2016-08-12 11:00:49 +12:00
Hamish Friedlander
29fc7ade96 Merge pull request #1574 from open-sausages/pulls/4.0/namespace-cms 
API namespace CMS
 2016-08-11 10:43:32 +07:00
Damian Mooyman
4dfa4f4473 Resolve issues with namespacing 2016-08-10 16:09:23 +12:00
Damian Mooyman
5bf364bedb Apply SilverStripe\CMS namespace 2016-08-10 16:09:23 +12:00
Damian Mooyman
cb946508cf Move CMS classes and templates to namespaced locations 2016-08-10 16:09:23 +12:00
Hamish Friedlander
25a8fb87da Merge pull request #1571 from open-sausages/pulls/4.0/virtualpage-controller 
API Better behaviour for virtualised controller
 2016-08-10 07:09:54 +07:00
Daniel Hensby
a6fae9b35b Merge pull request #1579 from tractorcow/pulls/3.4/fix-settings-border 
BUG Fix extra border in page settings
 2016-08-09 16:56:18 +01:00
Damian Mooyman
63fc4dbcae BUG Fix extra border in page settings 
Fixes #1547
 2016-08-09 17:19:45 +12:00
Damian Mooyman
7c13f7f75f Merge 3.4 into 3 
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
 2016-08-05 19:14:57 +12:00
Damian Mooyman
518eea2eac Merge 3.4.1 into 3.4 2016-08-05 19:11:42 +12:00
Damian Mooyman
5f07e193fa Update translations 2016-08-05 17:57:46 +12:00
Damian Mooyman
afc9bb0dc6 Merge 3.3 into 3.4 
# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml
 2016-08-05 16:46:35 +12:00
Damian Mooyman
2831fc6077 Merge 3.3.3 into 3.3 2016-08-05 16:41:07 +12:00
Damian Mooyman
8284fdc4ca Update translations 2016-08-05 16:13:13 +12:00
Damian Mooyman
99b3346316 Merge 3.2 into 3.3 2016-08-05 14:36:30 +12:00
Damian Mooyman
8c9a7042be Merge 3.2.5 into 3.2 2016-08-05 14:33:04 +12:00
Damian Mooyman
c449ad3f18 Update translations 2016-08-05 13:03:00 +12:00
Hamish Friedlander
e56e4cfd2a Merge pull request #1573 from open-sausages/pulls/4.0/move-NestedController 
API Move NestedController from cms to framework
 2016-08-05 12:09:34 +12:00
Damian Mooyman
795ece3352 Merge 3.1 into 3.2 
# Conflicts:
#	javascript/lang/fa_IR.js
#	javascript/lang/ru.js
#	javascript/lang/src/fa_IR.js
#	javascript/lang/src/ru.js
#	lang/fa_IR.yml
 2016-08-05 11:37:29 +12:00
Damian Mooyman
f0e380689e Merge 3.1.20 into 3.1 2016-08-05 11:31:44 +12:00
Damian Mooyman
6477e24219 Update translations 2016-08-05 11:06:51 +12:00
Damian Mooyman
19b811555c
API Move NestedController from cms to framework 2016-08-05 10:56:06 +12:00
Damian Mooyman
70179c8b87
API Better behaviour for virtualised controller 2016-08-04 14:19:33 +12:00
Hamish Friedlander
009246dc62 Merge pull request #1541 from open-sausages/features/4.0/gridfield-styles 
Gridfield styles update
 2016-08-04 11:57:34 +12:00
Paul Clarke
89aba7d146 Remove unwanted spacing 2016-08-03 12:10:54 +12:00
Paul Clarke
e6b31aaf04 Remove horizontal scroll on old asset admin grid 2016-08-03 12:10:54 +12:00
Paul Clarke
43ceeebb82 Gridfield updates for new styling. Mainly class update 2016-08-03 12:10:54 +12:00
Damian Mooyman
48a2aecaab Merge pull request #1537 from silverstripe-terraformers/fix/menuitems-fix 
When page is disabled, rename "Edit" label in contextmenu and …
 2016-08-02 17:01:07 +12:00
Hamish Friedlander
744118a9b6 Merge pull request #1570 from open-sausages/pulls/4.0/controller-link-standardise 
BUG Fix incorrect route registration order
 2016-08-02 13:28:40 +12:00