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
13,090 Commits 31 Branches 527 Tags 162 MiB
e07b14f5bc
Commit Graph

13090 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devlin
1e5679f20f BUGFIX i18n module load order in i18n::include_by_locale() 
The "project" module (normally mysite) is considered with the highest priority. Yet, the project's i18n is loaded first and cannot overwrite existing translations. I've added a array_reverse(), so the iteration keeps the translation of the module with the highest priority.

Old $sortedModules: mysite, (other_modules,) cms, admin, framework.
New $sortedModules: framework, admin, cms, (other_modules,) mysite.
 2013-10-11 15:20:51 +02:00
Ingo Schommer
9c75fc06e7 Merge pull request #2523 from wilr/agnosticloginmsg 
Change default message to be credential agnostic.
 2013-10-11 02:59:05 -07:00
Ingo Schommer
6c96c490c6 Load tree parent nodes if non-existant 
This edge case can occur when a large tree is cached in HTML already,
without any nodes expanded via ajax. If a new node is added with
a parent that's not existant, it was simply placed on the root node.
This is a display bug, a full CMS refresh fixes it.

Fixes a related bug where tree causes (view) duplicates,
where the same node is rendered twice. This was due to the whole
subtree being refreshed (including the new node) through jstree's
built-in "open"/"select" events, while at the same time
creating a new node through updateNodesFromServer() callbacks.

Also added a global tree loading indication to make it clear
that the tree is still processing.

See https://github.com/silverstripe/silverstripe-cms/issues/872
 2013-10-11 11:51:11 +02:00
Will Rossiter
3851ef9f2c Style destructive actions destructively 2013-10-11 20:00:11 +13:00
Will Rossiter
b0f38f4990 Change default message to be credential agnostic. 2013-10-11 11:22:15 +13:00
Simon Welsh
3e007ffbd2 Merge pull request #2509 from chillu/pulls/lastvisited 
API Removed Member.LastVisited and Member.NumVisits
 2013-10-10 13:07:42 -07:00
Ingo Schommer
829b45af67 Merge pull request #2371 from chillu/pulls/gridfield-fragment-docs 
GridField fragment docs
 2013-10-10 04:14:36 -07:00
Ingo Schommer
18826d5bd3 GridField fragment docs 2013-10-10 13:14:17 +02:00
Ingo Schommer
b5cee452b5 Merge pull request #2495 from madmatt/patch-1 
Update datamodel.md to use an array argument to Enum instead of the more...
 2013-10-10 04:13:09 -07:00
Ingo Schommer
a0080dc921 Merge pull request #2498 from jkempff/fix-1 
fixed wrong ID output for many_many and has_many relations
 2013-10-10 04:10:16 -07:00
Ingo Schommer
0870194463 Merge pull request #2511 from kinglozzer/email-tests 
Unit tests for Email class
 2013-10-10 04:03:21 -07:00
RuthAdele
9850d2c5f2 Remove large left margin on field description within cms-content-tools 2013-10-10 12:51:28 +02:00
Ingo Schommer
b367dd6237 API Removed Member.LastVisited and Member.NumVisits 2013-10-10 12:35:07 +02:00
Ingo Schommer
ed1a9adae6 Updated translations 2013-10-10 12:33:55 +02:00
Ingo Schommer
8727d1b1eb Merge remote-tracking branch 'origin/3.1' 2013-10-10 12:11:50 +02:00
Ingo Schommer
f6035505c1 Removed accidental artifacts 2013-10-10 12:11:26 +02:00
Ingo Schommer
691f1a3056 Merge pull request #2518 from dhensby/patch-1 
Appending to debug.log file
 2013-10-10 03:09:27 -07:00
Ingo Schommer
cd225f0fa4 No HTML entities in "Groups" ListboxField (fixes #2513) 2013-10-10 12:08:16 +02:00
Daniel Hensby
a8c9fffed4 Appending to debug.log file 
Until now debug.log files were loaded into memory, concatenated and then re-written to disk. This is an intensive operation on a large file.

I've added the `FILE_APPEND` flag to append to this file instead.
 2013-10-10 11:07:58 +01:00
Will Rossiter
9bb97140ad Merge pull request #2510 from kinglozzer/cmsmenuitem-tests 
Unit test coverage for CMSMenuItem
 2013-10-09 23:19:14 -07:00
Simon Welsh
c6c187b083 Merge pull request #2514 from ajshort/pull-4 
CMS Validation
 2013-10-09 18:45:43 -07:00
Andrew Short
a63b9c9d5d FIX: Fix not switching to the correct tab on validation error. 2013-10-09 23:28:09 +11:00
Andrew Short
ed9f8dcf1f BUG: Fix CMS forms with validation errors responding incorrectly. 
A new form instance was being constructed for the response, which mean
that a lot of the validation information was lost. This fix means that:

* Enterered data is correctly persisted.
* A validation error notification is displayed.
 2013-10-09 23:27:56 +11:00
Loz Calver
51be1e858a Unit tests for Email 
It's not much, but it's a start
 2013-10-09 11:51:29 +01:00
Loz Calver
c34167b0ec Unit test coverage for CMSMenuItem 2013-10-09 10:43:53 +01:00
Ingo Schommer
55c6f35e15 Merge pull request #2502 from colymba/fix-gridfield-delete-alert 
FIX gridfield delete alert selector specificity
 2013-10-09 01:54:39 -07:00
Ingo Schommer
156679ff14 Merge pull request #2507 from ajshort/pull-3 
API: Pass extra context information to shortcode handlers.
 2013-10-09 01:14:35 -07:00
Andrew Short
a339687493 API: Pass extra context information to shortcode handlers. 
This allows shortcodes to perform more complex actions on the element
which contains them. For example, the element reference can be used
to add extra classes or attributes to links which provide additional
metadata.
 2013-10-09 15:05:17 +11:00
Ingo Schommer
f0ccdeb9fc Updated Te Reo translation 2013-10-08 21:28:35 +02:00
Ingo Schommer
36d8a9f62d Chinese translation encoding 2013-10-08 12:20:10 +02:00
Ingo Schommer
93558a6d62 Globalization in TreeDropdownField JS 2013-10-08 12:12:25 +02:00
Ingo Schommer
9288bdc5ea Updated Te Reo translations 2013-10-08 11:37:11 +02:00
Ingo Schommer
62fa2739e6 Merge remote-tracking branch 'origin/3.1' 2013-10-08 11:22:04 +02:00
Ingo Schommer
e489384eea Moved manage-files.feature to cms module 2013-10-08 11:21:36 +02:00
Ingo Schommer
d485faf0c9 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	forms/Form.php
 2013-10-08 11:17:06 +02:00
Ingo Schommer
aa6ca49651 Merge pull request #2493 from kinglozzer/2449-form-validation-exemptions 
NEW: Allow setting of specific form actions that do not require validation on CMSForm
 2013-10-08 01:51:11 -07:00
Ingo Schommer
8d5209aef6 Migrated page-specific behat features to cms module 2013-10-08 00:24:05 +02:00
Ingo Schommer
6a665b4ca2 Behat jQuery reference 2013-10-07 23:44:13 +02:00
Ingo Schommer
7542a205f6 Merge pull request #2504 from chillu/travis-behat-test 
Travis behat tests
 2013-10-07 14:15:57 -07:00
Ingo Schommer
cd8eb646a7 Skip @assets and @todo in Travis behat 2013-10-07 22:55:24 +02:00
Ingo Schommer
a2cfe6e7ea Updated 3.1.1 changelog 2013-10-07 20:50:39 +02:00
Ingo Schommer
6e8ec778c3 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	lang/en.yml
 2013-10-07 16:19:40 +02:00
Ingo Schommer
795d3e4b3b Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	dev/install/install.php5
	docs/en/index.md
	tests/core/CoreTest.php
 2013-10-07 16:18:20 +02:00
Ingo Schommer
9824168b45 Removed link to non-functional dokuwiki install 2013-10-07 16:17:21 +02:00
Ingo Schommer
11fd15c87d Added 3.1.2 changelog 2013-10-07 15:21:56 +02:00
Ingo Schommer
0e5524af44 Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1 
Conflicts:
	docs/en/changelogs/3.1.1.md
	tests/behat/features/profile.feature
 2013-10-07 15:19:07 +02:00
Ingo Schommer
d3b5b11942 Added 3.1.1 changelog 2013-10-07 14:57:56 +02:00
Ingo Schommer
e4c2d64877 Updated translations 2013-10-07 14:28:02 +02:00
colymba
75f2b17f30 FIX gridfield delete alert selector specificity 2013-10-07 14:24:16 +03:00
Andrew Short
4f428497dd Merge pull request #2500 from halkyon/doc_updates 
Updating unit and integration testing documentation.
 2013-10-06 18:28:05 -07:00