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
12,788 Commits 31 Branches 527 Tags 162 MiB
6df276c843
Commit Graph

12788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
892b772d1c Merge pull request #2616 from Zauberfisch/3.1 
Check if remote class exists in DataObject->getRemoteJoinField()
 2013-12-19 11:05:13 -08:00
Ingo Schommer
23371b01aa "lost password" translation master (fixes #2725) 2013-12-19 20:00:59 +01:00
Ingo Schommer
ca0c56e203 Updated translation masters 
Fixed two inconsistenties with missing namespaces in templates.
 2013-12-19 19:51:25 +01:00
Ingo Schommer
03b2e9dc74 "alt" and "title" attrs for images from URLs (fixes #2723) 2013-12-19 19:43:46 +01:00
Ingo Schommer
0d6181ce6f Merge pull request #2722 from axyr/master 
File validate should have extend hook
 2013-12-19 09:22:19 -08:00
Ingo Schommer
78a530524b Merge pull request #2684 from Firesphere/feature/force_write_js_to_bottom 
NEW Forcefully write javascripts to the end of the HTML if wished
 2013-12-19 09:21:06 -08:00
Ingo Schommer
145f7b13fa Merge pull request #2729 from halkyon/dataobject_validate_visibility 
API DataObject::validate() visibility changed to public (issue #1659)
 2013-12-19 09:16:34 -08:00
Ingo Schommer
ddcdb2c0f0 Updated translations 2013-12-19 18:04:37 +01:00
Ingo Schommer
973d56e57b Updated translation docs to include JS process 2013-12-19 18:00:54 +01:00
Ingo Schommer
2fe703592c Merge pull request #2614 from ryanwachtl/2613-themedcss-project-dir 
Check for file in project() folder when calling Requirements::themedCSS(...
 2013-12-19 08:31:04 -08:00
Ingo Schommer
1fc1111eed Merge pull request #2719 from kinglozzer/uploadfield-deferred-loading 
FIX: Defer loading of UploadField EditForm iframes (fixes #2711)
 2013-12-19 08:26:57 -08:00
Loz Calver
06d7bb77c0 FIX: Defer loading of UploadField EditForm iframes (fixes #2711) 
Also addresses issue #1439.

I don’t like the binding iframe.on('load') events in the onclick handler, but apparently Entwine doesn't support binding on iframes.

AssetAdmin and HtmlEditorField support added
 2013-12-19 09:11:31 +00:00
Sean Harvey
8ea8789ba7 Merge pull request #2721 from froog/year_fix 
FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test.
 2013-12-18 21:55:48 -08:00
Sean Harvey
6fc9db6f0e API DataObject::validate() visibility changed to public (issue #1659) 
DataObject::validate() is currently set to protected, but this means
you can't call validate() from outside the context of itself unless
you overload the method to use a public visibility and then call
parent::validate()

As it would turn out, most classes that overload this method already
set the visibility to public, so it would make sense the parent matches
that as well.
 2013-12-19 16:36:39 +13:00
Ingo Schommer
15c7252af0 beforeMemberLoggedIn/beforeMemberLoggedOut hooks 
Required to save/restore parts of the session information,
which Member nukes indiscriminately on logout.

Specific use case is restoring linkages to temporary databases
on Behat test runs.
 2013-12-18 18:26:01 +01:00
Will Rossiter
763aa2fbf6 Clarify usage of extend within DataExtensions 2013-12-18 19:59:58 +13:00
Sean Harvey
b54661fd9f Merge pull request #2727 from jaydenseric/patch-1 
Fixed `SQLQuery` class code examples
 2013-12-17 16:53:21 -08:00
Jayden Seric
0b24d520f9 Update SQLQuery.php 
Updated `SQLQuery` class code examples for functions `setOrderBy` and `addOrderBy` to use their new names.
 2013-12-18 10:00:31 +11:00
Martijn
668610941c File validate should have extend hook 
Currently you can't add validation rules to File thru a DataExtension.
This fixes this issue.
 2013-12-16 17:07:33 +01:00
Martijn
ee336c13d9 Merge pull request #1 from silverstripe/master 
Update
 2013-12-16 08:04:26 -08:00
Daniel Pickering
94c19e349a FIX: Year.php getDefaultOptions now fixed, sets key as year. Also added YearTest unit test. 2013-12-16 03:29:29 +00:00
Firesphere
af7afbe918 IMPROVEMENT/FEATURE Forcefully write javascripts to the end of the HTML if wanted. 
It's defaulted to false. But when set to true, the JS is written to the end of the HTML, even though there are earlier scripts.
This results in faster page-loading if the JS isn't needed earlier-on.
 2013-12-14 14:04:03 +01:00
Ryan Wachtl
b260e5e29c FIX Check for file in project() folder when calling Requirements::themedCSS() #2613 
Allows overriding of theme and module css files by looking in project() folder first. Consistent with documented behavior.
 2013-12-13 11:12:22 -06:00
Ingo Schommer
ae0a42fc58 Merge pull request #2615 from a2nt/jquery.ondemand-fix 
BUG onDemand plugin fixture
 2013-12-13 03:35:44 -08:00
Ingo Schommer
ab91a5a80b Merge pull request #2622 from froog/patch-1 
Created LessThanOrEqualFilter and GreaterThanEqualFilter
 2013-12-13 03:34:45 -08:00
Ingo Schommer
34c5cb8d1b Added index docs to DataObject 
Thanks to @oddnoc for getting this started, see
https://github.com/silverstripe/silverstripe-framework/pull/2686
 2013-12-13 12:09:48 +01:00
Ingo Schommer
d5179adb01 Improved index docs 2013-12-13 12:06:22 +01:00
Ingo Schommer
daf30878b6 Merge pull request #2686 from oddnoc/indexes-documentation 
API: Support string descriptors for unique indexes
 2013-12-13 02:50:29 -08:00
Ingo Schommer
c811556ea5 Removed debug code 2013-12-13 10:04:26 +01:00
Ingo Schommer
8d796cbea0 Merge pull request #2679 from micmania1/2658-get-templates-with-suffix 
API: moved getTemplatesWithSuffix functionality out into a SSViewer
 2013-12-12 13:39:13 -08:00
Sean Harvey
d81c3570af Merge pull request #2714 from chillu/pulls/validate-write-message 
Leave original ValidationException intact in write()
 2013-12-10 16:36:13 -08:00
Ingo Schommer
be5484b1d2 Leave original ValidationException intact in write() 
If we want DataObject->validate() to be used instead of
the form layer, we should allow for validation errors
to be passed through unchanged to the controller layer
so we can present them to the user. The context of
which class is written should be apparent from the stacktrace
of the exception.
 2013-12-11 00:41:05 +01:00
Ingo Schommer
3566581a86 Added .content styles to debug.css, removed fieldset styling 2013-12-10 16:51:07 +01:00
Will Rossiter
d3838410e3 Merge pull request #2708 from chillu/pulls/addsearchparams 
Merge query strings in $.path rather than duplicating
 2013-12-08 20:27:52 -08:00
Firesphere
82fe21ff23 Merge branch 'feature/force_write_js_to_bottom' of https://github.com/Firesphere/silverstripe-framework into feature/force_write_js_to_bottom 2013-12-07 15:48:00 +01:00
Firesphere
41371fea72 NEW Force the javascripts to be put before the closing body tag 2013-12-07 15:47:31 +01:00
Firesphere
14447b167a IMPROVEMENT/FEATURE Forcefully write javascripts to the end of the HTML if wanted. 
It's defaulted to false. But when set to true, the JS is written to the end of the HTML, even though there are earlier scripts.
This results in faster page-loading if the JS isn't needed earlier-on.
 2013-12-07 15:47:27 +01:00
Firesphere
261aae3b8b Git is complaining about a non-existing commit 2013-12-07 15:43:38 +01:00
Firesphere
bdf0130eda NEW Force the javascripts to be put before the closing body tag 2013-12-07 15:39:07 +01:00
Firesphere
f9e9614a4f IMPROVEMENT/FEATURE Forcefully write javascripts to the end of the HTML if wanted. 
It's defaulted to false. But when set to true, the JS is written to the end of the HTML, even though there are earlier scripts.
This results in faster page-loading if the JS isn't needed earlier-on.
 2013-12-07 15:39:05 +01:00
Ingo Schommer
41031900f9 Merge query strings in $.path rather than duplicating 
Fixes common duplications like ?locale=en_US&locale=en_US,
triggered e.g. by gridfield's showDetailView().

See https://github.com/silverstripe/silverstripe-translatable/issues/154
 2013-12-07 11:14:46 +01:00
Sean Harvey
ac1220758e Merge pull request #2707 from wilr/enums 
Tidy up enum matching where classname is missing
 2013-12-06 15:44:57 -08:00
Will Rossiter
20e082d00e Tidy up enum matching where classname is missing 2013-12-07 12:18:58 +13:00
Fred Condo
b88a0955a5 API: Support string descriptors for unique indexes in Versioned 
- Document the format for descriptor arrays
- Implement the behaviour that developers have come to expect for
  string descriptors of indexes
- Add test for handling of unique indexes (MySQL & sqlite3)
- Resolve #2403

Versioned needs to convert unique indexes to non-unique for its suffixed
tables, such as Foo_Live and Foo_versions. Because DataObject accepts
string descriptors such as array('UniqIDX' => 'unique (Uniq)') as well
as array-based descriptors, Versioned needs to recognize string
descriptors. This patch accomplishes that. Before, Versioned would fail
to convert string-described indexes to non-unique, resulting in run-time
errors when creating a new version of an object.
 2013-12-06 10:02:44 -08:00
Ingo Schommer
323364bc85 Fixed merge errors 2013-12-06 15:44:24 +01:00
Ingo Schommer
740560c487 Fixed merge errors 
- HTML identifier changes in master breaking tests
- Regression from b6b3cd9889 in GridFieldSortableHeader (var capitalisation)
 2013-12-06 15:37:51 +01:00
Ingo Schommer
b1fa2d282e Merge remote-tracking branch 'origin/3.1' 2013-12-06 13:04:56 +01:00
Will Rossiter
8ad172cff5 Merge pull request #2704 from Juanitou/patch-1 
Typography review
 2013-12-05 18:57:55 -08:00
Will Rossiter
999af8d9cf Merge pull request #2705 from ditorelo/patch-1 
Updating SearchContext documentation
 2013-12-05 18:53:42 -08:00
Diogo Freire
8f8a200496 Updating SearchContext documentation 
PaginatedList::setPageSize and PaginatedList::setTotalSize don't exist.
 2013-12-06 15:45:38 +13:00