Commit Graph

428 Commits

Author SHA1 Message Date
Robbie Averill
937d73fefc Merge branch '4.2' into 4.3
# Conflicts:
 #	docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
 #	lang/en.yml
2019-01-08 12:25:48 +01:00
Aaron Carlino
9939719ae3 Update translations 2018-12-12 12:50:47 +13:00
Robbie Averill
10f502f0c7 Merge branch '4.2' into 4.3 2018-11-09 11:39:05 +02:00
Robbie Averill
5b7723df7f Merge branch '4.1' into 4.2
# Conflicts:
 #	lang/fi.yml
 #	lang/nl.yml
2018-11-09 11:38:04 +02:00
Robbie Averill
df4d2bd838 Merge branch '4.0' into 4.1
# Conflicts:
 #	lang/da.yml
 #	lang/eo.yml
 #	lang/fi.yml
 #	lang/it.yml
 #	lang/nl.yml
 #	lang/sv.yml
2018-11-09 11:36:34 +02:00
Aaron Carlino
1db568cdb6 Update translations 2018-11-08 16:25:41 +13:00
Vagrant Default User
26d404ca4c Update translations 2018-11-07 21:37:35 +13:00
Aaron Carlino
74de2ce3b7 Update translations 2018-11-07 17:57:45 +13:00
Aaron Carlino
1944a5a99b Update translations 2018-11-07 16:31:27 +13:00
Loz Calver
dca2d47127
Merge pull request #8357 from creative-commoners/pulls/4.3/fix-i18n
FIX Text collector translations now compile without errors
2018-10-11 13:16:23 +02:00
Maxime Rainville
cc22024e9a ADD New search component for GridFields (#1777) 2018-09-04 11:35:17 +12:00
Robbie Averill
2254459310 FIX Text collector translations now compile without errors 2018-09-03 08:21:05 +02:00
Robbie Averill
83e461abbf Merge branch '4.2' into 4 2018-08-27 16:15:57 +12:00
Robbie Averill
18fff5c16c Remove past tense for "log in" in expired token message 2018-08-20 22:31:23 +12:00
Daniel Hensby
4d83330981
Merge branch '4.2' into 4 2018-07-30 17:11:42 +01:00
root
c4b2f758c1 Update translations 2018-07-30 14:12:40 +00:00
Daniel Hensby
d0598c02c5
Merge branch '4.2' into 4 2018-07-30 11:07:15 +01:00
Daniel Hensby
ec5640cbd9
Merge tag '4.2.0' into 4.2
Release 4.2.0
2018-07-30 11:04:57 +01:00
root
bdf3bc965c Update translations 2018-07-24 19:07:41 +00:00
Daniel Hensby
6e1c7c2781
FIX remove personal information from password reset confirmation screen 2018-07-23 14:13:52 +01:00
Daniel Hensby
ac5c3416a4
Merge branch '4.2' into 4 2018-07-13 17:06:51 +01:00
Luke Edwards
599a4420bf FIX Improve GridFieldViewButton to work with new Archive Admin (#8240)
* Add gridfield restore action, enable view button in action menu

* Abstract restore action and create test

* Use more appropriate canRestoreToDraft and isArchived, move translations

* Use Hierarchy to determine if a record should be restored to root

* Move restore action to versioned
2018-07-13 10:45:13 +12:00
Daniel Hensby
560fe9820a FIX remove personal information from password reset confirmation screen 2018-07-05 14:19:15 +12:00
Damian Mooyman
cfc3b851e7
Merge remote-tracking branch 'origin/4.1' into 4.2
# Conflicts:
#	lang/sv.yml
2018-06-19 17:20:25 +12:00
Damian Mooyman
2bbb3bd798 Update translations 2018-06-19 16:50:07 +12:00
Damian Mooyman
3bad65a726 Update translations 2018-06-15 15:39:15 +12:00
Luke Edwards
385e9e105c Create GridField Actions Menu component (#8083)
* WIP GridField action menu work, the gist of the idea is using a new gridfield component

* Add delete action to actions menu

* Actions are added automatically to action menu (allows for extension)

* Add test and minor changes

* Add docs and minor changes

* Refactor ActionMenuItem into distinct types, general ActionMenu cleanup

* Add icons and fix title

* Pass columnName, so it can be used by components

* Update test to open and find action menu buttons

* Add section in changelog upgrade section for GridField_ActionMenu
2018-05-29 16:10:52 +12:00
Damian Mooyman
b0b8a2f625
Merge remote-tracking branch 'origin/4.1' into 4 2018-03-14 11:26:26 +13:00
Damian Mooyman
3700c0a33d Update translations 2018-03-14 09:45:54 +13:00
Andrew Aitken-Fincham
00ff3ba4b2 ENHANCEMENT Make dropdownFieldThreshold configurable on DBForeignKey (#7789) 2018-02-13 10:32:55 +13:00
Damian Mooyman
21ffb270a5 Update translations 2018-02-07 16:07:27 +13:00
Damian Mooyman
e111da2769 Update translations 2018-02-05 16:58:21 +13:00
Damian Mooyman
7ba19fc282 Update translations 2018-01-25 12:15:34 +13:00
Damian Mooyman
60fa7558d3
BUG Fix double casting in login authenticator name
Fixes #7769
2018-01-22 14:06:24 +13:00
Damian Mooyman
b939224615 Update translations 2017-12-07 11:08:25 +13:00
Damian Mooyman
f8bde9de32 Update translations 2017-11-02 16:30:42 +13:00
Christopher Joe
f6b7cf8889 Feature disable current user from removing their admin permission 2017-10-30 12:34:06 +13:00
Damian Mooyman
24a1266967 Update translations 2017-10-25 16:18:07 +13:00
Damian Mooyman
37bc6e5099 Update translations 2017-10-11 17:46:48 +13:00
Robbie Averill
33ae463e5b FIX Class name in _t() call in installer and run text collector 2017-09-26 14:57:16 +13:00
Damian Mooyman
56abd3be57 Update translations 2017-09-08 16:52:22 +12:00
Damian Mooyman
e61163ce7f Update translations 2017-08-07 14:34:14 +12:00
Damian Mooyman
e64acef53a BUG Fix invalid i18n yaml 2017-08-03 10:13:09 +12:00
Damian Mooyman
1867ee82c4
Sync with transifex 2017-08-02 13:16:53 +12:00
Robbie Averill
e307f067ed FIX Replace deprecated %s placeholders in translations with named placeholders
* Remove the use of sprintf and %s placeholders in the i18n tests
2017-08-02 13:03:55 +12:00
Damian Mooyman
4b23205838
Fix unnamespaced i18n keys
Fixes https://github.com/silverstripe/silverstripe-framework/issues/6862
2017-07-04 14:18:47 +12:00
Damian Mooyman
cbe9edc468 Update translations 2017-07-03 17:17:41 +12:00
Loz Calver
5d27dccd60 NEW: Add CSRF token to logout action 2017-06-21 15:42:13 +01:00
Damian Mooyman
0f90c5b63f ENHANCEMENT Update style of CMSLogin form 2017-06-15 18:13:14 +12:00
Daniel Hensby
a65ae8353a Merge pull request #6879 from mikenz/patch-11
MINOR: Fix mismatched brackets
2017-05-11 11:57:46 +01:00