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
10,127 Commits 31 Branches 527 Tags 162 MiB
4e403160f3
Commit Graph

10127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Rossiter
62adea5882 Merge pull request #851 from Juanitou/patch-2 
Update docs/en/reference/dataextension.md
 2012-10-07 12:32:28 -07:00
Juan Molina
2c480ed94e Update docs/en/reference/dataextension.md 
Removed ForumRole broken link and minor typo.
 2012-10-07 18:11:40 +03:00
Ingo Schommer
2034927d31 Merge pull request #850 from willmorgan/patch-2 
Fixed grammatical error for Form.FIELDISREQUIRED
 2012-10-05 10:28:07 -07:00
Will Morgan
1c7b7d0ab5 Fixed grammatical error for Form.FIELDISREQUIRED 2012-10-05 18:04:38 +02:00
Ingo Schommer
be13ba3ef9 Removed 'built-in page controls' links from docs 
See https://github.com/silverstripe/sapphire/pull/842, thanks Juanitou!
 2012-10-05 17:39:19 +02:00
Ingo Schommer
890bac8de3 Docs: GridFieldDeleteAction 2012-10-05 17:39:19 +02:00
TeamCity
f4c918dabe Merge remote branch 'origin/master' into translation-staging 2012-10-06 04:27:39 +13:00
Ingo Schommer
a259eaee53 Merge pull request #846 from normann/ea_cherry_pick 
commits that has been cherry picked from custom project
 2012-10-05 08:14:45 -07:00
Normann Lou
9aaa6b1a7b ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty. 2012-10-05 17:00:39 +13:00
Normann Lou
1fca4911e1 BUGFIX: replace 'sapphire' with 'framework' in those legacy fields: TableField, TableListField and ComplexTableField. 2012-10-05 16:54:14 +13:00
Jeremy Bridson
ad7383a58d ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change. 2012-10-05 16:30:47 +13:00
TeamCity
d447526947 Merge remote branch 'origin/master' into translation-staging 2012-10-05 15:54:56 +13:00
Simon Welsh
5768e421dc Merge branch '3.0' 2012-10-05 14:40:32 +13:00
Simon Welsh
8153326360 Merge branch 'tinymce_fancy_selectts' of https://github.com/halkyon/sapphire into 3.0 
Conflicts:
	admin/_config.php
 2012-10-05 14:39:27 +13:00
Simon Welsh
b1902008a3 Merge pull request #843 from halkyon/tinymce_fixes 
BUG Non-breaking space added automatically by TinyMCE on anchors
 2012-10-04 18:33:45 -07:00
Sean Harvey
7901b02333 Use TinyMCE fancy selects for better usability selecting styles 
This was previously disabled because of a bug in TinyMCE on
SilverStripe 2.3, but appears to have been resolved since then.
 2012-10-05 14:18:30 +13:00
Sean Harvey
113545d177 BUG Non-breaking space added automatically by TinyMCE on anchors 
Everytime TinyMCE is saved, it adds &nbsp; characters immediately
after anchors, e.g. <a name="test"></a>&nbsp; - this fix stops
TinyMCE from adding those extraneous &nbsp; after the anchors.
 2012-10-05 14:14:59 +13:00
TeamCity
95057bba1e Updated translations 2012-10-05 03:04:39 +13:00
TeamCity
e9ece6a908 Updated translations 2012-10-05 00:30:01 +13:00
TeamCity
f148dca8ca Updated translations 2012-10-04 23:31:10 +13:00
TeamCity
90932ee5aa Updated translations 2012-10-04 22:19:47 +13:00
TeamCity
83bae90b08 Updated translations 2012-10-04 21:21:09 +13:00
TeamCity
1171060442 Updated translations 2012-10-04 20:21:53 +13:00
Ingo Schommer
daaa1b3147 Merge pull request #841 from drzax/log-enhancement 
ENHANCEMENT Make it possible to extend SS_Log
 2012-10-03 23:40:22 -07:00
Simon Elvery
de36063d15 ENHANCEMENT Make it possible to extend SS_Log 
Using late static binding makes it possible to override SS_Log to create
logs which are separate to the main Silverstripe log but still use the
built in functionality.

Add test for SS_Log subclassing.
 2012-10-04 16:34:20 +10:00
TeamCity
e358eac22f Updated translations 2012-10-04 19:19:53 +13:00
TeamCity
4d7512c541 Updated translations 2012-10-04 18:27:07 +13:00
Sam Minnée
5d127e1254 Merge pull request #840 from silverstripe-rebelalliance/config_system_docs 
NEW Add documentation for the new config system in 3.0
 2012-10-03 20:37:31 -07:00
Hamish Friedlander
11f1c0a5c3 NEW Add documentation for the new config system in 3.0 2012-10-04 16:34:57 +13:00
TeamCity
9746aa85d5 Updated translations 2012-10-04 16:21:48 +13:00
TeamCity
b090081ca8 Updated translations 2012-10-04 15:19:32 +13:00
TeamCity
252cba912a Updated translations 2012-10-04 13:19:40 +13:00
TeamCity
efa676e16f Updated translations 2012-10-04 11:19:49 +13:00
TeamCity
936f78a079 Merge remote branch 'origin/master' into translation-staging 2012-10-04 05:14:11 +13:00
Ingo Schommer
fb5e488103 Line length fixes 2012-10-03 18:11:31 +02:00
TeamCity
ff6326b507 Updated translations master 2012-10-04 04:28:07 +13:00
TeamCity
1e31e4d2c1 Merge remote branch 'origin/master' into translation-staging 2012-10-04 04:27:42 +13:00
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
 2012-10-03 16:16:19 +02:00
TeamCity
fc9433f4c7 Updated translations 2012-10-03 23:18:30 +13:00
TeamCity
098c461f3c Updated translations 2012-10-03 22:18:23 +13:00
Sam Minnee
323fd4aa0f FIX: Fixed ef81318aea for PostgreSQL by quoting fields. 2012-10-03 15:34:39 +13:00
Sam Minnee
4e1b6af10f Fixed long line. 2012-10-03 15:15:21 +13:00
Ingo Schommer
ef81318aea BUG Retaining join extraFields on ManyManyList->add() 2012-10-03 14:58:28 +13:00
Damian Mooyman
4d392098a5 FIX: GridFieldPageCount now throws an exception if added to a gridfield with no gridfieldpaginator 2012-10-03 14:54:37 +13:00
Damian Mooyman
f265595c1e NEW: GridFieldPageCount control for displaying the current page count/total in the gridview header. Designed to complement a functional pager in the grid footer. 
NEW: GridFieldPageCount widget to default config settings
FIX: @extend .col_buttons in GridField.scss which was raising a warning
 2012-10-03 14:54:37 +13:00
TeamCity
745533f676 Updated translations 2012-10-03 02:55:44 +13:00
TeamCity
444356e8d4 Updated translations 2012-10-03 00:18:37 +13:00
Ingo Schommer
b22a7afc03 BUG TreeDropdownField panel positioning 
See https://github.com/silverstripe/sapphire/pull/809, thanks martinduparc
 2012-10-02 12:02:42 +02:00
Ingo Schommer
4684601c38 Fixed markdown whitespace usage 2012-10-02 11:38:16 +02:00
Ingo Schommer
fe4f0c92e2 Markdown line endings 2012-10-02 00:02:44 +02:00