tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-07-01 00:49:26 +02:00
Code Issues Projects Releases Wiki Activity
4,584 Commits 30 Branches 398 Tags 25 MiB
e3a321b306
Commit Graph

4584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
e3a321b306 Merge pull request #1304 from scott1702/update-upload-button 
Update asset admin toolbar
 2015-10-30 10:27:29 +13:00
scott1702
6dc3fc1f26 Update asset admin toolbar 2015-10-30 10:05:51 +13:00
Ingo Schommer
79f23631c9 Merge pull request #1300 from open-sausages/features/dbfile-generated-files 
Generated files API
 2015-10-23 16:54:18 +13:00
Damian Mooyman
227e2ba162 API Move ErrorPage to new generated files API 2015-10-23 10:08:51 +13:00
Sam Minnée
f340130e8d Merge pull request #1303 from open-sausages/pulls/php-5.5-min 
Increase minimum required PHP version to 5.5
 2015-10-22 10:45:07 +01:00
Ingo Schommer
d9b5895ee3 Increase minimum required PHP version to 5.5 
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
 2015-10-22 22:13:14 +13:00
Damian Mooyman
604edd8f6e Merge pull request #1302 from kinglozzer/yaml-fix 
FIX: Remove tab - invalid YAML
 2015-10-20 09:10:22 +13:00
Loz Calver
d7dcb41b27 FIX: Remove tab - invalid YAML 2015-10-19 17:10:47 +01:00
Ingo Schommer
b487d59d02 Merge pull request #1291 from open-sausages/pulls/4.0/dbfile-file-dataobject 
API CMS Implementation of RFC-1 Asset Abstraction (DataObject Refactoring)
 2015-10-19 16:47:18 +13:00
Damian Mooyman
2bd9d00da0 API Remove filesystem sync 
API support new asset abstraction
BUG Fix file link tracking for new asset abstraction
 2015-10-19 13:42:39 +13:00
Damian Mooyman
bcc19df231 Merge pull request #1286 from spekulatius/remove-trailing-spaces 
remove trailing spaces in the codebase
 2015-09-29 17:37:59 +13:00
Peter Thaleikis
4694763fa5 remove trailing spaces in the codebase 2015-09-29 17:18:03 +13:00
Damian Mooyman
dc9286af6e Merge pull request #1279 from open-sausages/pulls/move-addfile-ui 
Moved upload files page to main files area
 2015-09-29 13:19:46 +13:00
David Craig
1ea22c766c Move UI to main assets area 2015-09-29 09:35:28 +13:00
Ingo Schommer
3d315b418f Merge pull request #1282 from tractorcow/pulls/4.0/fix-virtualpage-regressions 
BUG Fix regressions in CMS from db field changes
 2015-09-29 09:05:31 +13:00
Damian Mooyman
8e3f549b19 BUG Fix regressions in CMS from db field changes 2015-09-28 17:22:44 +13:00
Damian Mooyman
60e75cbd99 Fix travis php version back to 5.4 2015-09-09 17:46:57 +12:00
Damian Mooyman
e68a752ac7 Merge remote-tracking branch 'origin/3' 
Conflicts:
	.travis.yml
 2015-09-09 14:53:48 +12:00
Damian Mooyman
b7ad568644 Merge remote-tracking branch 'origin/3.2' into 3 2015-09-09 14:50:28 +12:00
Damian Mooyman
f2efbefb8c Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
 2015-09-09 14:09:00 +12:00
Loz Calver
2a7a5ac9fc Merge pull request #1268 from scott1702/font-icons 
Update font icons to use new library
 2015-08-28 10:31:18 +01:00
Damian Mooyman
b26b6c3eca Update translations 2015-08-26 13:56:19 +12:00
Loz Calver
a382dd1cfc Merge pull request #1269 from sminnee/travis-disable-irc 
MINOR: Remove IRC notifications of travis builds.
 2015-08-25 09:07:20 +01:00
Sam Minnee
8a3e84ba1c MINOR: Remove IRC notifications of travis builds. 
Companion to https://github.com/silverstripe/silverstripe-framework/pull/4535
 2015-08-25 18:12:22 +12:00
scott1702
c028278957 Update font icons to use new library 2015-08-25 15:08:09 +12:00
Damian Mooyman
1ada2dab1d Merge pull request #1264 from scott1702/filtered-tree 
Update the filtered tree styling
 2015-08-25 14:50:36 +12:00
scott1702
4f05c4c4f8 Update the filtered tree styling 2015-08-25 13:02:20 +12:00
Sam Minnée
da348f74e8 Merge pull request #1265 from tractorcow/pulls/3.2/fix-archived-actions 
BUG block adding children from archived pages
 2015-08-24 17:04:46 +12:00
Sam Minnée
a650d6ad39 Merge pull request #1266 from tractorcow/pulls/3.2/packages 
Fix missing packages
 2015-08-24 17:04:43 +12:00
Damian Mooyman
a3f789c2b5 Update translations 2015-08-24 16:29:40 +12:00
Damian Mooyman
46180f671e Fix missing packages 2015-08-24 16:14:33 +12:00
Damian Mooyman
6c17397322 BUG block adding children from archived pages 
Fixes #1260
 2015-08-24 15:16:09 +12:00
Damian Mooyman
3adef16034 Merge remote-tracking branch 'origin/3' 
Conflicts:
	.travis.yml
 2015-08-24 12:02:51 +12:00
Sam Minnée
4db4db05af Merge pull request #1263 from ss23/fix_812_oldpageredirector 
MINOR Change how OldPageRedirector gets URLs to fix nested redirects
 2015-08-21 17:26:09 +12:00
Stephen Shkardoon
b87f5473d9 MINOR Change how OldPageRedirector gets URLs to fix nested redirects 
Previously, we would be limited by the way allParams will return 3 parameters
 at most. This way, we get the full URL.
Keep in mind, this code still needs a clean up, but at least it's not buggy now.
 2015-08-21 00:29:37 +12:00
Daniel Hensby
bf6a84bd2f Fixing behat regression 2015-08-18 00:34:49 +01:00
Daniel Hensby
ab59113612 Fixing core release for travis 2015-08-18 00:09:02 +01:00
Sean Harvey
e5a4cdb302 Merge pull request #1261 from dhensby/pulls/remove-nightly 
Removing hhvm-nightly as its not supported on travis
 2015-08-18 10:07:16 +12:00
Daniel Hensby
f81159c2f7 Removing PHP 5.3 from travis 2015-08-17 17:30:48 +01:00
Daniel Hensby
4039805ac2 Removing hhvm-nightly as its not supported on travis 2015-08-17 16:53:42 +01:00
Daniel Hensby
7d50e0fac7 Merge branch '3' 
Conflicts:
	.travis.yml
 2015-08-17 14:24:16 +01:00
Daniel Hensby
39ee2ec634 Merge branch '3.2' into 3 
Conflicts:
	lang/en.yml
 2015-08-17 14:23:16 +01:00
Daniel Hensby
80aca3a511 Merge branch '3.1' into 3.2 2015-08-17 14:20:58 +01:00
Loz Calver
718503edb1 Merge pull request #1100 from antons-/773-nested-virtual-pages-allowed_children 
* antons--773-nested-virtual-pages-allowed_children:
  Issue #773 - $allowed_children not allowing nested virtual pages
 2015-08-06 10:51:56 +01:00
Anton Smith
c6684559f6 Issue #773 - $allowed_children not allowing nested virtual pages 
Additional check to see if a 'VirtualPage' has a page attached to it
 2015-08-06 10:47:23 +01:00
Damian Mooyman
a1b9e99342 Update localisation 2015-08-04 13:02:52 +12:00
Sam Minnée
fd457fe93e Merge pull request #1256 from tractorcow/pulls/3.2/batch-restore-beta 
API batch restore action (ALTERNATE SOLUTION)
 2015-08-03 22:08:13 +12:00
Damian Mooyman
e22b653e06 API batch restore action 2015-08-03 20:57:30 +12:00
Damian Mooyman
f38402bee3 Merge pull request #1254 from scott1702/update-alerts 
Update archive warning to include children pages
 2015-08-03 18:14:12 +12:00
Sam Minnée
fa8aa8f92e Merge pull request #1241 from tractorcow/pulls/3.2/predictable-ids 
API respect custom attributes on OptionsetField and CheckboxSetField
 2015-08-03 17:23:24 +12:00