tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,842 Commits 31 Branches 527 Tags 162 MiB
3c2b53157e
Commit Graph

15842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
ea00c670fd Merge pull request #5009 from scott1702/arrow-icons 
Add new font icons to set
 2016-02-04 11:24:36 +13:00
Damian Mooyman
d754884214 Update translations 2016-02-04 11:03:41 +13:00
Damian Mooyman
2f28154711 Merge pull request #5008 from dhensby/pulls/modeladmin-reading-mode 
Set the stage reading mode in LeftAndMain
 2016-02-04 10:44:36 +13:00
scott1702
f39989a396 Add new font icons to set 
Add .no-text class for icons which have no text
 2016-02-04 10:34:30 +13:00
Daniel Hensby
316d5ef967 Set the stage reading mode in LeftAndMain 2016-02-03 21:27:13 +00:00
Damian Mooyman
50e508544b Merge pull request #5006 from scott1702/logout-icon 
Remove old logout icon on retina screens
 2016-02-03 17:59:00 +13:00
Damian Mooyman
eaf9d32bc7 Merge pull request #5005 from dhensby/pulls/modeladmin-reading-mode 
Set the stage reading mode in LeftAndMain
 2016-02-03 16:54:02 +13:00
scott1702
15fba5a4cb Remove old logout icon on retina screens 
Remove background rules for old preview icons
 2016-02-03 16:36:21 +13:00
Damian Mooyman
63ea28c0f8 Merge pull request #5003 from ZarockNZ/patch-1 
Correct minor typo
 2016-02-03 13:15:45 +13:00
Daniel Hensby
24aaee984e Set the stage reading mode in LeftAndMain 2016-02-02 13:35:39 +00:00
DouG
87a674a460 Correct minor typo 
had the word "fun" rather than "run"
 2016-02-01 16:25:17 +13:00
Damian Mooyman
7226524eb2 BUG Fix invalid sv translation yml 2016-01-29 10:15:21 +13:00
Damian Mooyman
49e5038927 Merge pull request #4986 from benmanu/pulls/wysiwyg-file-links 
BUG Fix TinyMCE insert link not respecting "open in new window" checkbox
 2016-01-29 09:36:08 +13:00
Ben Manu
361c9a03fe FIX: removing hardcoded target _blank for tinymce file links 
This will allow file links to respect content editor input
 2016-01-27 14:51:20 +13:00
Daniel Hensby
0b8a65d1e2 Merge pull request #4856 from tractorcow/pulls/4.0/robust-test-listener 
BUG Fix SapphireTestReporter erroring
 2016-01-26 23:08:55 +00:00
Damian Mooyman
106eb6e8a5 Merge pull request #4984 from dhensby/pulls/3/fix-action-alignment 
FIX CMS actions alignment
 2016-01-27 09:47:57 +13:00
Daniel Hensby
c5fc9dd650 FIX CMS actions alignment 2016-01-26 14:38:48 +00:00
Damian Mooyman
5952e38208 Merge pull request #4981 from JorisDebonnet/patch-1 
Fix incomplete functionality from #3734
 2016-01-26 18:52:44 +13:00
Ingo Schommer
15c5012cb0 Merge pull request #4937 from open-sausages/pulls/4.0/module-loader 
Implement RFC-7 JavaScript module loader
 2016-01-26 16:44:20 +13:00
JorisDebonnet
51e9923c6c Fix incomplete functionality from #3734 
#3734 introduced the ability to *create* `mailto:` links with a subject in them, without the ability to *edit* them. This fixes that.
 2016-01-26 01:31:07 +01:00
Damian Mooyman
d4521cbc92 Update gitattributes and Rebuild bundles 2016-01-26 13:14:48 +13:00
Ingo Schommer
a5754674b7 Clarified impact of NPM/Browserify in changelog 2016-01-26 11:39:53 +13:00
Damian Mooyman
6cebffd89b BUG Fix SSViewerTest not restoring old requirements 
BUG Fix incorrect js path in UploadField.php
Restore changes missing from merge
 2016-01-26 11:39:53 +13:00
David Craig
2fc9d69197 Remove files after rebase 2016-01-26 11:39:53 +13:00
David Craig
2140025c20 Implement RFC-7 JavaScript module loader 
- Adds ES6 support via Babel
- Transforms existing JavaScript to UMD modules
- Adds module bundling via Browserify
- Existing JavaScript converted to UMD modules
- lib.js and leftandmain.js are bundled using browserify
- JavaScript minifying of bundles handed by gulp
 2016-01-26 11:39:20 +13:00
Damian Mooyman
9662d938f3 API remove obsolete class loaders from test listeners 2016-01-26 10:33:57 +13:00
Damian Mooyman
790a6da24e Merge pull request #4979 from dhensby/pulls/3/SilbinaryWolf-minor-optimization 
Replaced filterByCallback for 'Children' to just create a new array a…
 2016-01-26 10:13:58 +13:00
Daniel Hensby
e74665b639 Merge pull request #4964 from tractorcow/pulls/4.0/tomap-standardise 
API Standardise SS_List::map() implementation
 2016-01-25 13:31:05 +00:00
Silbinary Wolf
073e73a2f4 Replaced filterByCallback for 'Children' to just create a new array as function calls are exponentially expensive in PHP (the more functions that exist, the slower a function call becomes) and replaced 'array_key_exists' with op-code equivalent for speed. The best increase isn't really noticeable but we should work towards optimizing the core as much as possible. 2016-01-25 13:22:51 +00:00
Loz Calver
60c97dbf14 Merge pull request #4977 from tractorcow/pulls/3.2/fix-idlist-docs 
FIX PHPDocs on DataList::getIDList() and UnsavedRelationList::getIDList
 2016-01-25 09:27:16 +00:00
Damian Mooyman
69c9ad1428 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/css/ie8.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_style.scss
#	css/AssetUploadField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
#	lang/fi.yml
 2016-01-25 16:15:41 +13:00
Damian Mooyman
d8555b73c4 Merge pull request #4978 from mediabeastnz/patch-3 
Removed PlayerCsvBulkLoader as importer
 2016-01-25 16:05:13 +13:00
Damian Mooyman
e091bb8474 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	tests/model/VersionedTest.yml
 2016-01-25 15:57:37 +13:00
Damian Mooyman
f79f99f14b Merge remote-tracking branch 'origin/3.3.0' into 3.3 2016-01-25 15:43:30 +13:00
Damian Mooyman
b4e76df531 Add upgrading notes to rc1 2016-01-25 15:35:42 +13:00
Myles Beardsmore
b0057c77f0 Removed PlayerCsvBulkLoader as importer 
Removed PlayerCsvBulkLoader as model importer class and replaced it with CsvBulkLoader instead.
 2016-01-25 15:26:25 +13:00
Damian Mooyman
5f511e5048 Added 3.3.0-rc1 changelog 2016-01-25 15:22:58 +13:00
Damian Mooyman
75493e79ff Update translations 2016-01-25 15:06:55 +13:00
Damian Mooyman
7c448bb4a2 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	tests/model/DataObjectLazyLoadingTest.php
#	tests/model/VersionedTest.yml
 2016-01-25 14:11:37 +13:00
Damian Mooyman
d8e354d144 FIX PHPDocs on DataList::getIDList() and UnsavedRelationList::getIDList() 2016-01-25 11:09:37 +13:00
Damian Mooyman
e77389d0c8 API Standardise SS_List::map() implementation 
Fixes #1593
 2016-01-25 10:22:47 +13:00
Damian Mooyman
f8ce2d7631 Merge pull request #4973 from dhensby/pulls/multibyte-char-fix 
Remove question marks, equal signs and hashes
 2016-01-25 10:00:07 +13:00
Daniel Hensby
75905b9d33 Merge pull request #4976 from assertchris/replace-obsolete-mime-types 
Replaced obsolete mime types
 2016-01-24 10:29:22 +00:00
assertchris
c66f973fce Replaced obsolete mime types 2016-01-24 18:15:47 +13:00
Daniel Hensby
e9d45b4d5f Merge pull request #4954 from tractorcow/pulls/3.3/version-fixes 
BUG Fix VersionedTest sometimes failing given certain querystring arguments
 2016-01-22 18:53:21 +00:00
Daniel Hensby
415318042d Merge pull request #4952 from silverstripe/local-bin 
Install sake into /usr/local/bin. /usr is now protected on OSX
 2016-01-22 18:49:40 +00:00
Will Rossiter
d9fd442b0e Install sake into /usr/local/bin. /usr is now protected on OSX 
https://support.apple.com/en-us/HT204899
 2016-01-22 18:48:58 +00:00
Daniel Hensby
f131b0d91e Merge pull request #4961 from silverstripe/tractorcow-patch-1 
DOCS Update branch names
 2016-01-22 18:20:15 +00:00
Daniel Hensby
119bd2f873 Merge pull request #4845 from tractorcow/pulls/3/extension-hook-byref 
API before/afterExtend now support parameters passed by reference
 2016-01-22 16:08:20 +00:00
Jarkko Linnanvirta
bc9aa09b1f Remove question marks, equal signs and hashes 
Those were not removed if multibyte was allowed.
 2016-01-22 15:40:11 +00:00