Commit Graph

13446 Commits

Author SHA1 Message Date
Daniel Hensby
b2ace2b76c Merge pull request #3689 from guru-digital/patch-2
Add ability to use Basic Auth when running PHP in CGI mode in Apache
2014-12-08 18:39:42 +00:00
Will Morgan
18f0cb650e Merge pull request #3708 from JorisDebonnet/patch-4
File.php: support for MS Office template / macro files
2014-12-05 10:49:41 +00:00
Stig Lindqvist
9155eb5802 Merge pull request #3675 from micmania1/fix-datadifferencer-comparison
FIX DataDifferencer was trying to compare fields, even if the fields did...
2014-12-05 19:04:05 +13:00
Corey Sewell
fbebf96d66 Add detection for PHP running in CGI mode and add HTTP_AUTHORIZATION rewrite rule
Detect and parse HTTP_AUTHORIZATION for basic authentication running PHP in CGI mode
Add comments about using CGI mode with Apache and Basic Auth in /docs/en/topics/environment-management.md
Added notes  to docs/en/changelogs/3.1.9.md
2014-12-05 11:35:52 +13:00
JorisDebonnet
af47a63322 File.php: support for MS Office template / macro files
Fixes #3692
2014-12-04 21:57:31 +01:00
Ingo Schommer
e349a13968 Merge pull request #3693 from JorisDebonnet/patch-4
Update Member.Email from 256 to 254 length
2014-12-05 09:04:38 +13:00
Daniel Hensby
7f0d6421e8 Merge pull request #3705 from JayDevlin/minor-controller-ss
MINOR Closing tag in Controller.ss
2014-12-04 18:00:23 +00:00
Will Morgan
ad672af7a9 Merge pull request #3700 from dhensby/pulls/editor-config
Adding .editorconfig file
2014-12-04 15:06:56 +00:00
Devlin
8e27f3c3dc MINOR Closing tag in Controller.ss 2014-12-04 15:41:10 +01:00
Cam Findlay
22ecab555c DOCS Repositioned house rules and added core commiter list. 2014-12-04 15:39:19 +13:00
Will Rossiter
836ea04d90 Add note about semvar to contributing.md 2014-12-04 12:14:18 +13:00
Loz Calver
369c561aa2 Merge pull request #3666 from Copperis/versioned-0-version-write-fix
Versioned now creates a new version if the version is 0
2014-12-03 09:43:53 +00:00
Damian Mooyman
1f4f5e68ba BUG Fix versioned
Versioned is not writing Version to _version tables for subclasses of Version dataobjects which have their own DB fields
- Fix disjoint of ID / RecordID (which should be the same)
- Fix calculation of new record version
- Fix use of empty vs !isset to check for existing version

Conflicts:
	model/Versioned.php
	tests/model/VersionedTest.php

Cherry picked from commit c140459ac6
2014-12-02 22:30:59 +02:00
Daniel Hensby
54f837159a Adding .editorconfig file 2014-12-02 15:13:55 +00:00
JorisDebonnet
1cd54e6bdc Update Member.Email from 256 to 254 length
Fixes #3074
2014-11-29 22:30:11 +01:00
micmania1
7384d011e9 FIX DataDifferencer was trying to compare fields, even if the fields didn't exist causing an error. 2014-11-28 05:35:06 +00:00
Damian Mooyman
3b3478136d Merge pull request #3677 from jonom/3093-flush-bugs
FIX: Manifest flushing
2014-11-27 11:24:40 +13:00
Daniel Hensby
ca7030d70d Merge pull request #3683 from bendubuisson/patch-2
Update 5-dataobject-relationship-management.md
2014-11-26 20:42:17 +00:00
Daniel Hensby
979389ca72 Merge pull request #3687 from bendubuisson/patch-4
Update access-control.md
2014-11-26 20:36:12 +00:00
Ben Dubuisson
e30a354076 Update access-control.md
small typo
2014-11-27 09:25:43 +13:00
Daniel Hensby
9e7373a365 Merge pull request #3686 from AntonyThorpe/patch-2
Update docs/en/reference/index.md
2014-11-26 20:04:14 +00:00
Antony Thorpe
9a7686c8b9 Update docs/en/reference/index.md
GridField line included twice
2014-11-27 08:06:00 +13:00
Daniel Hensby
a8ae5cc55b Merge pull request #3684 from bendubuisson/patch-3
Update member.md
2014-11-26 15:30:40 +00:00
Ben Dubuisson
514098c01a Update member.md
small typo
2014-11-26 16:32:57 +13:00
Ben Dubuisson
efd978074c Update 5-dataobject-relationship-management.md
Some more typos, sorry didn't pick them all up at the same time!
2014-11-26 14:37:33 +13:00
Jonathon Menz
01989aac4e FIX: Manifest flushing
Fixes silverstripe/silverstripe-framework#2325
Fixes silverstripe/silverstripe-framework#3093

Static manifest was not being flushed during a dev/build on some environments (without ?flush in URL) and template manifest was never being flushed during a dev/build.
2014-11-26 10:15:09 +10:30
Ingo Schommer
a61fb89e4f Merge pull request #3682 from bendubuisson/patch-1
Update 5-dataobject-relationship-management.md
2014-11-26 11:53:28 +13:00
Ben Dubuisson
a622fce073 Update 5-dataobject-relationship-management.md
typos
2014-11-26 11:43:49 +13:00
Ingo Schommer
4d4c651b50 Merge pull request #3673 from g4b0/patch-6
Update datamodel.md
2014-11-24 22:52:53 +13:00
Gabriele Brosulo
90a7761394 Update datamodel.md
Syntax error
2014-11-24 10:50:38 +01:00
Sean Harvey
f270dbcad6 Merge pull request #3665 from tractorcow/pulls/3.1/disable-auth
API Allow CMS re-authentication to be completely disabled if necessary
2014-11-24 09:21:31 +13:00
Daniel Hensby
2055194903 Merge pull request #3668 from phillprice/patch-7
Update DropdownField.php
2014-11-22 21:55:30 +00:00
Phill Price
ff67b5ba84 Update DropdownField.php
Update to DropdownField::create, and in one instance set the Empty Title on the instantiation, rather than afterwards.
2014-11-22 21:01:08 +00:00
Damian Mooyman
31b5a9dc86 API Allow CMS re-authentication to be completely disabled if necessary 2014-11-21 17:43:53 +13:00
Daniel Hensby
f636d15332 Merge pull request #3659 from phillprice/patch-6
Update csv-import.md
2014-11-20 09:00:41 +00:00
Phill Price
ff65f5e00f Update csv-import.md
Translated the German to English to match up other areas in document
2014-11-19 21:29:54 +00:00
Loz Calver
d91150cc72 Merge pull request #3645 from jonom/insert-from-styles
MINOR: Fix broken 'Insert From CMS' layout
2014-11-19 09:18:50 +00:00
Damian Mooyman
fe0d330c59 Merge pull request #3656 from halkyon/nginx_buffers
Adding appropriate nginx fastcgi buffer config required for admin
2014-11-19 15:50:55 +13:00
Jonathon Menz
e4db619f8d MINOR: Fix broken 'Insert From CMS' layout
Some updates to UploadField styles broke the layout of this form a bit
2014-11-19 10:52:08 +10:30
Josh Kosmala
2e416b60f3 Update javascript.md fixes #3652
I needed to know how to do this to do some jQuery manipulation in the CMS.
2014-11-18 21:56:51 +00:00
Daniel Hensby
e5bed94d07 Merge pull request #3626 from 3Dgoo/feature/site-reports-doc-fix
Updating Site Reports documentation
2014-11-18 20:59:57 +00:00
Sean Harvey
8d2727eab6 Adding appropriate nginx fastcgi buffer config required for admin 2014-11-19 09:56:40 +13:00
Damian Mooyman
dceaeedc43 Merge pull request #3643 from chillu/pulls/htaccess-doc
Improve .htaccess commenting
2014-11-19 08:51:10 +13:00
Damian Mooyman
72484cd0bf Update index.md 2014-11-18 18:41:23 +13:00
Damian Mooyman
c279ff7f0c Merge remote-tracking branch 'origin/3.1.8' into 3.1 2014-11-18 18:40:15 +13:00
Damian Mooyman
8b3695bd41 Added 3.1.8 changelog 2014-11-18 18:30:19 +13:00
Damian Mooyman
d84926492c BUG Security::findAnAdministrator doesn't always find an admin 2014-11-18 16:55:11 +13:00
Sean Harvey
27e2a68ef2 Merge pull request #3653 from tractorcow/pulls/3.1/install-admin
BUG Security::findAnAdministrator doesn't always find an admin
2014-11-18 16:24:40 +13:00
Damian Mooyman
2bdfd65e9b BUG Security::findAnAdministrator doesn't always find an admin 2014-11-18 15:36:34 +13:00
Loz Calver
e4ddb4b975 FIX: Ensure query string in X-Backurl is encoded (fixes #3563) 2014-11-16 20:35:41 +00:00