TeamCity
fea1992ed1
MINOR Updated translations
2012-11-16 23:25:01 +13:00
TeamCity
8f4936c4dd
MINOR Updated translations
2012-11-15 13:13:47 +13:00
TeamCity
8ecf8273db
MINOR Updated translations
2012-11-04 22:36:53 +13:00
TeamCity
b0fc307ac0
Merge remote branch 'origin/master' into translation-staging
2012-11-03 12:23:53 +13:00
Simon Welsh
8a0f234acf
Merge pull request #870 from chillu/pulls/datalist-filterany
...
NEW DataList->filterAny()
2012-11-02 16:17:48 -07:00
TeamCity
c968d85bd8
Updated translations
2012-11-03 10:20:21 +13:00
TeamCity
9adf725657
Updated translations master
2012-11-03 10:15:32 +13:00
TeamCity
3d96995f5e
Merge remote branch 'origin/master' into translation-staging
2012-11-03 10:15:08 +13:00
Ingo Schommer
70352fba32
Merge pull request #880 from adrexia/fileoverview
...
BUG: File Uploading Notifications (fixes #7883 )
2012-11-02 14:08:16 -07:00
TeamCity
4e403160f3
Merge remote branch 'origin/master' into translation-staging
2012-11-03 08:20:31 +13:00
Ingo Schommer
de987b017d
Merge pull request #918 from adrexia/7965-autocomplete
...
BUG: GridField add existing auto complete has no max height (fixes #7965 )
2012-11-02 11:30:02 -07:00
Naomi Guyer
95b5f6541f
BUG: GridField add existing auto complete has no max height ( fixes #7965 )
...
Added a maxheight to the ui-autocompleter, as used in gridfield, and
specified what to do with overflow.
2012-11-02 13:36:51 +13:00
Naomi Guyer
2dabaebad8
BUG: File Uploading Notifications ( fixes #7883 )
...
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
2012-11-02 12:46:16 +13:00
TeamCity
76d26a75e2
Merge remote branch 'origin/master' into translation-staging
2012-11-02 07:28:51 +13:00
Ingo Schommer
43cd54bb25
Added composer.json
2012-11-01 17:28:51 +01:00
TeamCity
4cbe58cf4b
Updated translations
2012-11-01 23:39:19 +13:00
TeamCity
b6180498d7
Merge remote branch 'origin/master' into translation-staging
2012-11-01 22:23:10 +13:00
Ingo Schommer
18d691b570
Merge pull request #914 from adrexia/refactor-sitetree
...
BUG: Site Tree checkboxes and refactoring
2012-11-01 01:27:24 -07:00
Ingo Schommer
48b93312c4
Merge pull request #908 from chillu/pulls/xmldataformatter-canview
...
API Removed permission checks from XML/JSON data formatters
2012-11-01 01:21:47 -07:00
TeamCity
e0239799df
Updated translations
2012-11-01 21:19:16 +13:00
Naomi Guyer
eb23f502b5
BUG: Site Tree checkboxes and refactoring
...
* Increased height of site tree checkbox by 3px, so users are less
likely to miss it and load a page by mistake
* Refactored _tree.scss to make better use of SCSS, and stop repetition
of styles
2012-11-01 15:26:46 +13:00
TeamCity
4105813860
Updated translations
2012-11-01 12:03:06 +13:00
TeamCity
13858d2b70
Merge remote branch 'origin/master' into translation-staging
2012-11-01 11:57:36 +13:00
Ingo Schommer
c090b316d1
Merge pull request #913 from adrexia/fix-style-scss
...
BUG: One too many brackets in _style.scss
2012-10-31 15:29:20 -07:00
Naomi Guyer
2a67715327
BUG: One too many brackets in _style.scss
...
Caused when merging 3.0 back into master
2012-11-01 11:16:13 +13:00
TeamCity
061af9d43a
Updated translations
2012-11-01 10:25:30 +13:00
TeamCity
913b537cf8
Updated translations
2012-11-01 06:19:16 +13:00
TeamCity
e5451bdb63
Updated translations
2012-11-01 05:21:01 +13:00
TeamCity
cc4347671c
Updated translations
2012-11-01 00:30:46 +13:00
TeamCity
6f87a6ea47
Updated translations
2012-10-31 21:18:57 +13:00
Ingo Schommer
d54b1b4d86
API Removed permission checks from XML/JSON data formatters
...
Please handle those checks in the logic using the formatters
instead. Applied permission checks to its primary use case,
the "restfulserver" module.
2012-10-30 23:34:29 +01:00
TeamCity
9918c00e05
Updated translations
2012-10-31 10:19:04 +13:00
TeamCity
4b54f18e28
Updated translations
2012-10-31 08:09:49 +13:00
TeamCity
4d251df4ff
Updated translations
2012-10-31 06:59:19 +13:00
TeamCity
aa41d30940
Updated translations master
2012-10-31 06:55:27 +13:00
TeamCity
a4d5a8c774
Merge remote branch 'origin/master' into translation-staging
2012-10-31 06:55:02 +13:00
Ingo Schommer
08832261c1
Fixed merge errors in CMSProfileController
2012-10-30 18:03:49 +01:00
Ingo Schommer
efabde1416
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
admin/css/screen.css
admin/scss/_style.scss
security/Member.php
2012-10-30 17:52:49 +01:00
Ingo Schommer
a502b222cc
Merge remote-tracking branch 'origin/2.4' into 3.0
2012-10-30 17:24:52 +01:00
Ingo Schommer
945d8ba140
Merge commit '6a06965b3732a3a820913b7f119bf618a99635ab' into 3.0
2012-10-30 17:24:35 +01:00
Ingo Schommer
9e595db7f3
Changelogs
2012-10-30 17:00:41 +01:00
TeamCity
822d96d508
Updated translations
2012-10-30 03:19:54 +13:00
TeamCity
555760087f
Updated translations
2012-10-30 02:22:43 +13:00
TeamCity
e9c7b1f841
Updated translations
2012-10-30 00:20:17 +13:00
TeamCity
c6cf8908fc
Updated translations
2012-10-29 23:46:08 +13:00
Simon Welsh
624f427c2a
Removes line longer than 120c
2012-10-29 10:22:53 +13:00
Simon Welsh
3542b7ecf8
Merge pull request #900 from phptek/3.0
...
MINOR: Fixed typo; "SilverStripe" was mis-spelled.
2012-10-28 12:47:07 -07:00
Russell Michell
031681814b
MINOR: Fixed typo; "SilverStripe" was mis-spelled.
2012-10-29 08:13:43 +13:00
TeamCity
56aee1c43b
Merge remote branch 'origin/master' into translation-staging
2012-10-28 16:52:13 +13:00
Will Rossiter
69ea73b4ed
Merge pull request #777 from halkyon/field_edit3
...
Member_ProfileForm respect canEdit() permissions on Member
2012-10-27 20:11:46 -07:00
