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,566 Commits 31 Branches 527 Tags 162 MiB
1468db494b
Commit Graph

15566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
1468db494b Merge pull request #4992 from tractorcow/pulls/4.0/cleanup-object 
Remove Object::useCustomClass and break Object into traits
 2016-02-19 23:29:12 +00:00
Damian Mooyman
1c3709371e Merge pull request #5059 from benmanu/pulls/remove-tabstrip 
Removing unused thirdparty dependency - tabstrip.
 2016-02-19 15:33:03 +13:00
Damian Mooyman
8ae0eccce5 Merge pull request #5058 from benmanu/pulls/remove-jquery-metadata 
Removing unused thirdparty dependency - jquery-metadata.
 2016-02-19 15:32:50 +13:00
Damian Mooyman
23a06776e6 Merge pull request #5057 from benmanu/pulls/remove-jquery-selector 
Removing unused thirdparty dependency - query-selector.
 2016-02-19 15:32:41 +13:00
Damian Mooyman
beb32e2cb9 Merge pull request #5055 from benmanu/pulls/remove-greybox 
Removing unused thirdparty dependency - greybox.
 2016-02-19 14:47:57 +13:00
Damian Mooyman
676fe4c722 Merge pull request #5054 from benmanu/pulls/remove-firebug-lite 
Removing unused thirdparty dependency - firebug-lite.
 2016-02-19 14:47:34 +13:00
Ben Manu
1902600012 Removing unused thirdparty dependency - tabstrip. 2016-02-19 14:40:16 +13:00
Ben Manu
7e116aa908 Removing legacy TODO reference for data-urlviewfile on MediaForm once metadata dep is removed. 2016-02-19 14:33:20 +13:00
Ben Manu
abfc1d0a6c Removing unused thirdparty dependency - jquery-metadata. 2016-02-19 13:57:55 +13:00
Ben Manu
9c83739721 Removing unused thirdparty dependency - query-selector. 2016-02-19 11:22:17 +13:00
Ben Manu
1a32862540 Removing unused thirdparty dependency - greybox. 2016-02-19 10:44:47 +13:00
Ben Manu
8523e0ceee Removing unused thirdparty dependency - firebug-lite. 2016-02-19 10:42:35 +13:00
Damian Mooyman
829135a85a API remove Object::useCustomClass 
API Broke out Injectable, Configurable, and Extensible from Object into traits
BUG Fix missing extraDataObjects in tests
 2016-02-17 10:22:04 +13:00
Damian Mooyman
b82d585b57 Merge pull request #5019 from open-sausages/require-react 
Include React and related libraries in framework
 2016-02-15 16:25:39 +13:00
scott1702
2bf802a8cd Include React and related libraries in framework 2016-02-15 16:05:55 +13:00
Damian Mooyman
230d017677 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/css/ie7.css.map
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/font/icon-reference.html
#	admin/font/silverstripe.eot
#	admin/font/silverstripe.svg
#	admin/font/silverstripe.ttf
#	admin/font/silverstripe.woff
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
 2016-02-12 15:41:45 +13:00
Damian Mooyman
cfd8102431 Merge pull request #5024 from froog/patch-2 
API Ensure filterByCallback returns object of called class
 2016-02-11 09:46:18 +13:00
Daniel Pickering
9f95c76e5b Update ArrayList.php 2016-02-11 08:19:29 +13:00
Ingo Schommer
4f9d4928aa Merge pull request #4252 from patbolo/cross-device-remember-me 
NEW Cross device "Remember Me" feature
 2016-02-11 08:07:50 +13:00
Daniel Pickering
d41d601701 Ensure filterByCallback returns object of called class 
This change ensures that filterByCallback returns a filtered list of the same called class, if ArrayList is extended.

The current filterByCallback always instantiates an ArrayList with the filtered results, which is probably not what you want if you extend ArrayList.


eg; currently this occurs
```
class MyArrayList extends ArrayList {
   public function sayHello() {
      return 'hi'; 
   }
}

$list = MyArrayList::create();
//populate $list here
$filtered = $list::filterByCallback($someCallback);

$filtered->sayHello();  
// -> The method 'sayHello' does not exist on 'ArrayList' 
```
 2016-02-10 23:14:07 +13:00
Jean-Fabien Barrois
bab1f230bf NEW Cross device "Remember Me" feature 
At the moment, using the "Remember me" function on more than one device will only work with the last device used. Previous devices will not auto login.
This PR introduces a new DataObject for storing hashed tokens against multiple devices. Developers can configure if logging out should discard all tokens, or only the one used on the device logging out; token expiry date is 90 days by default but configurable. For added security, the old behaviour can still be enforced if multiple tokens are not desired.
See silverstripe#1574 for additional background
 2016-02-10 09:42:08 +13:00
Damian Mooyman
d5b4c90cb4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_fonts.scss
#	admin/scss/_retina.scss
 2016-02-09 18:25:47 +13:00
Damian Mooyman
35b5c03fbc Merge branch 3.3.0 into 3.3 2016-02-09 18:22:58 +13:00
Damian Mooyman
96a905aa09 Update changelog 2016-02-09 18:07:11 +13:00
Damian Mooyman
f66e21c10d Added 3.3.0-rc2 changelog 2016-02-09 18:02:22 +13:00
Damian Mooyman
adc7a59108 Update translations 2016-02-09 17:45:21 +13:00
Daniel Hensby
cb39c41872 Merge pull request #5015 from webbuilders-group/3.3-datetime-search-fix 
BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel
 2016-02-05 15:31:37 +00:00
Daniel Hensby
d339642cac Merge pull request #4972 from kinglozzer/pulls/back-button 
Re-instate back button for item edit forms
 2016-02-05 15:20:04 +00:00
UndefinedOffset
0c252af334 BUGFIX: Fixed issue #5002 DatetimeField styles in the new filter panel 2016-02-05 10:53:35 -04:00
Loz Calver
70f8343475 Re-instate back button for item edit forms 2016-02-05 09:39:57 +00:00
Daniel Hensby
31a4e184f7 Merge pull request #5013 from Legin76/patch-2 2016-02-04 21:26:47 +00:00
Legin76
68433cc552 Update UploadField.php to allow configurable GridFieldPaginator 
Changed $config->addComponent(new GridFieldPaginator(11)); to allow it to be configured from the config.yml
 2016-02-04 17:23:32 +00:00
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
Daniel Hensby
24aaee984e Set the stage reading mode in LeftAndMain 2016-02-02 13:35:39 +00: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
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
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