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
15,925 Commits 31 Branches 527 Tags 162 MiB
e266037720
Commit Graph

15925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loz Calver
219f76f87c Merge pull request #4951 from divya-patel/logout-menu-update 
Minor:updated the menu on the top left; changed styles
 2016-01-21 09:54:54 +00:00
Damian Mooyman
5138bf1b7f API Refactor out Page default classname hack 
Fixes #1932
 2016-01-21 17:12:55 +13:00
Damian Mooyman
99de74d69e API Add isDisabledValue to SelectField 
API Remove deprecated {comma} syntax for multi select string encoded values
API MemberDatetimeOptionsetField now has a fixed preview date
BUG fix inverted arguments in OptionSetField::getOptionClass
 2016-01-21 15:40:19 +13:00
Damian Mooyman
bdb1a95758 API Cleanup and refactor of select fields 
API Standardise Relation interface
 2016-01-21 15:40:19 +13:00
Damian Mooyman
bc2a4dd652 Merge pull request #4953 from lry6003/search-icon 
Search Icon Hover/Active/Focus changes
 2016-01-21 14:57:13 +13:00
Damian Mooyman
d8ea6ceccc Update translations 2016-01-21 14:22:35 +13:00
Damian Mooyman
45c6d0284a Minor: Update branch names 2016-01-21 14:02:42 +13:00
divzpatel123@gmail.com
4dee924432 Minor:updated the menu on the top left; changed styles 2016-01-20 15:44:40 +13:00
Damian Mooyman
df76d783fe BUG Fix VersionedTest sometimes failing given certain querystring arguments 2016-01-20 14:49:46 +13:00
Luke Ryley
38e2cb5b6d Search Icon Hover/Active/Focus changes 
Changed the color of the search icon when it is in Hover/Active/Focus state and removed backgroup color changes in these states
 2016-01-20 14:35:54 +13:00
Damian Mooyman
eeb110a04f Merge pull request #4939 from lry6003/unbold-labels 
Minor: Unbolded labels in CMS
 2016-01-20 13:31:13 +13:00
Damian Mooyman
e6b877df27 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
 2016-01-20 13:16:27 +13:00
Damian Mooyman
8e4db95f72 Fix merge regressions 2016-01-19 17:08:40 +13:00
Damian Mooyman
8c1cafd1a0 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	admin/scss/_tree.scss
#	javascript/TreeDropdownField.js
 2016-01-19 17:08:26 +13:00
Damian Mooyman
d561551a19 Merge pull request #4943 from Meeeeeeow/LinkColourChange 
Changed the link colours
 2016-01-19 16:33:21 +13:00
Meeeeeeow
e448774150 Fixed Typo 
Changed 'Gudes' to 'Guides'
 2016-01-19 16:18:35 +13:00
Meeeeeeow
4301ae20bf Changed the link colours 2016-01-19 15:46:29 +13:00
Damian Mooyman
5d240feaec Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:24 +13:00
Damian Mooyman
46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2 
# Conflicts:
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
#	docs/en/03_Upgrading/index.md
#	docs/en/05_Contributing/01_Code.md
#	forms/TreeMultiselectField.php
#	security/Permission.php
 2016-01-19 14:00:19 +13:00
Luke Ryley
2701248387 Minor: Unbolded labels in CMS 
- updated _forms.scss removed font-weight
- also removed drop-shadow include
Luke Ryley - open source academy
 2016-01-19 12:04:55 +13:00
Damian Mooyman
4de81a7bc8 Merge pull request #4935 from SpiritLevel/3.1-docs 
DOCS 3.1 : typos and broken internal links
 2016-01-18 15:23:15 +13:00
Ingo Schommer
0675b1d82f Merge pull request #4929 from open-sausages/features/provided-requirements 
API Enable single javascript files to declare that they include other files
 2016-01-15 17:14:48 +13:00
David Alexander
45d2b57a65 DOCS 3.1 : typose and broken internal links 2016-01-15 16:39:23 +13:00
Damian Mooyman
bd0716d1ee Merge pull request #4930 from SpiritLevel/3.1-docs 
DOCS 3.1 - fixes broken internal links
 2016-01-15 10:02:43 +13:00
Damian Mooyman
8e1ae55ff6 API Enable single javascript files to declare that they include other files 2016-01-15 09:49:28 +13:00
David Alexander
5c99e33eb2 DOCS 3.1 - fixes broken internal links 2016-01-14 23:59:53 +13:00
Damian Mooyman
35bb3a4801 Merge pull request #4918 from mejt/3 
Disabled displaying SilverStripe Development Tools header when signed in user go to /dev/build page
 2016-01-14 10:14:38 +13:00
Damian Mooyman
37107e49c6 Merge pull request #4924 from bummzack/4920-i18n-default-locale 
i18n::default_locale should return the value set via config.
 2016-01-14 09:45:18 +13:00
Mateusz
ed04972c3c Fixed permission checks for /dev/build action 2016-01-13 14:05:14 +01:00
Ingo Schommer
01ef4c2d05 Merge pull request #4863 from open-sausages/pulls/4.0/secure-assets 
API Asset Access Control implementation
 2016-01-13 22:24:14 +13:00
Roman Schmid
68e00d768a i18n::default_locale should return the value set via config. 
Deprecate `default_locale` setter and getter methods, analoguous to other config getters and setters.
 2016-01-13 09:24:15 +01:00
Damian Mooyman
738e1db756 Update Nginx rules 
Prevent disclosure of secure assets
 2016-01-13 18:18:22 +13:00
Damian Mooyman
037467beae API Asset Access Control implementation 2016-01-13 18:18:22 +13:00
Ingo Schommer
f665e96b21 Merge pull request #4898 from open-sausages/pulls/4.0/npm 
Adds npm for managing client-side dependencies
 2016-01-13 13:12:29 +13:00
Damian Mooyman
6e29d35c27 Merge pull request #4922 from flamerohr/vagrant-tutorial 
DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox
 2016-01-13 13:09:48 +13:00
Damian Mooyman
12612b4200 Merge pull request #4914 from torleif/patch-2 
FIX OptionsetField returns valid HTML #4901
 2016-01-13 13:06:51 +13:00
Christopher Joe
007e0eeb2f DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox 2016-01-13 12:12:21 +13:00
David Craig
254b942737 Adds npm for managing client-side dependencies 
- Includes a package.json file with build and CI scripts
- Includes shrinkwrap file for locking dependency version
- Includes Gulp for running build tasks
- Includes a 'build' task for copying library files from node_modules to thirdparty
- Includes a 'sanity' task for makes sure library files in thirdparty match what's in node_modules
- Includes updates to .travis.yml (new JS_SANITY_CHECK flag) to run the sanity task
 2016-01-13 09:23:47 +13:00
Loz Calver
5a9fcf3d2b Merge pull request #4782 from dhensby/pulls/3/fix-anchors 
Fixing anchor selection
 2016-01-12 20:15:53 +00:00
Daniel Hensby
2dd8d5e518 Fixing anchor selection 2016-01-12 17:35:06 +00:00
Mateusz Ksiazek
c20d5b6861 Disabled displaying SilverStripe Development Tools header when signed in user go to /dev/build page 2016-01-12 17:01:42 +01:00
Torleif West
a7110bef70 FIX OptionsetField uses aria-required 2016-01-12 14:52:36 +13:00
Damian Mooyman
1a6655b2e2 Merge pull request #4915 from torleif/patch-3 
FIX OptionsetField input has required #4901
 2016-01-12 13:54:41 +13:00
torleif
122784b1cb FIX OptionsetField input has required #4901 2016-01-12 12:22:24 +13:00
torleif
288c8a8b27 FIX OptionsetField returns valid HTML #4901 2016-01-12 11:38:03 +13:00
Damian Mooyman
aac59a85ff Merge pull request #4908 from kinglozzer/cms-1307-filelink-field 
FIX: Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307)
 2016-01-12 11:01:49 +13:00
Damian Mooyman
1d13660530 Merge pull request #4907 from d-rivera-c/pulls/group-roles-admin-check 
Display all roles when an admin, filter by OnlyAdminCanApply when not
 2016-01-12 10:50:07 +13:00
Damian Mooyman
0b3b7ba134 Merge pull request #4888 from sminnee/remove-trailing-whitespace 
MINOR: Remove trailing whitespace
 2016-01-12 10:18:09 +13:00
Jono Menz
734bbd5df4 Merge pull request #4900 from scott1702/tabs-outline 
Remove the focus outline when clicking on tabs
 2016-01-11 09:19:27 -08:00
Loz Calver
85ba918a54 FIX: Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307) 2016-01-11 16:37:27 +00:00