Commit Graph

373 Commits

Author SHA1 Message Date
Andrew O'Neil
062c319000 Ignore HTML folder, not pear folder (merged from 2.1.0 branch, r42740)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42926 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:58:26 +00:00
Andrew O'Neil
5e5f200021 Correct comment (merged from 2.1.0 branch, r42718)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42925 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:57:24 +00:00
Andrew O'Neil
ba02a631c9 Added better checking for wonky databases (merged from 2.1.0 branch, r42589)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42924 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:56:43 +00:00
Andrew O'Neil
7df57c3040 DataObject merging error solving (merged from 2.1.0 branch, r42561 & 42588)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42923 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:55:55 +00:00
Andrew O'Neil
07eafb0aaf File modification for gallery (merged from 2.1.0 branch, r42517)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42922 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:53:19 +00:00
Andrew O'Neil
70db5d36a0 Hack to fix Fatal error: Call to undefined method stdClass::allMethodNames() (merged from 2.0.2 branch, r42505)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42921 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:52:31 +00:00
Andrew O'Neil
bd81e2a2be Optional reporting of versions to SilverStripe (merged from 2.1.0 branch, r42422)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42920 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:51:22 +00:00
Andrew O'Neil
bb2a97856f File Attribute Adding for the gallery module (merged from 2.1.0 branch, r42339)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42919 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:50:36 +00:00
Andrew O'Neil
30efb8efc7 #1444 - DataObjectDecorator? Merge Fields HUGE PROBLEM (merged from 2.1.0 branch, r42210)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42918 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:48:37 +00:00
Andrew O'Neil
5062c955e0 Replace blank strings with null - see http://www.silverstripe.com/general-discussion/flat/5050?start=8 (merged from 2.1.0 branch, r42173)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42917 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:46:33 +00:00
Andrew O'Neil
3a6556bbd0 Remove css requirements from core, in case user does not want to include these. (merged from 2.1.0 branch, r42168)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42915 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:40:08 +00:00
Andrew O'Neil
b8b3bab508 Link to the documentation on default pages (merged from 2.1.0 branch, r41730)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42914 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:37:10 +00:00
Andrew O'Neil
717737ed27 Fix error when creating new redirector page (merged from 2.1.0 branch, r41675)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42913 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:36:13 +00:00
Andrew O'Neil
75f598de37 If there's a silverstripe-cache directory in the silverstripe folder, always use that instead of /tmp (merged from 2.1.0 branch, r41578)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:34:36 +00:00
Andrew O'Neil
7455457964 Fixed php notice (merged from 2.1.0 branch, r41552)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42911 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:33:18 +00:00
Andrew O'Neil
e46e5e73c9 Allow logging in via BasicAuth, so the publish site script can login before doing a db/build (merged from 2.1.0 branch, r41535)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42909 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:32:11 +00:00
Andrew O'Neil
508830ec38 Use permission code (merged from 2.1.0 branch, r41533)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42908 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:30:20 +00:00
Andrew O'Neil
03807c5883 Fix notices
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42907 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 04:24:46 +00:00
Jeremy Shipman
e0ddba6ab8 Merging 2.1 blog into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42892 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 03:21:38 +00:00
Jeremy Shipman
45ff73d72e Merging 2.1 blog into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42890 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 03:20:56 +00:00
Jeremy Shipman
f4a357021b Migrating new parser code from 2.1
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42886 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-02 02:59:09 +00:00
Jeremy Shipman
023778c002 fixed virtual page creation. yay!
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-10-01 05:23:17 +00:00
Ingo Schommer
6eb306f343 removing Security_login.css Requirement (slipped in accidentally)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42751 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 23:14:40 +00:00
Ingo Schommer
e07939d9df styling in profile-popup
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42748 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 23:06:15 +00:00
Ingo Schommer
07c3a3a32b aoneil: allow the dev servers and test servers to be set via Director (merged from branches/2.1.0)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42736 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:50:10 +00:00
Ingo Schommer
a6700028b2 BUGFIX: Changed language-dropdown to normal dropdown-field (wasn't selecting the right languages)
FEATURE: Added "profile"-popup with Member_ProfileForm (see r42730)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42732 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:16:23 +00:00
Ingo Schommer
3bcf84de92 ENHANCEMENT: Coding conventions (check_default_admin())
ENHANCEMENT: only include tab-styling/js when more than one login-method is available

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42731 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 21:13:59 +00:00
Ingo Schommer
6ec4b77cd5 ENHANCEMENT: Coding conventions, wording
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42730 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:59:46 +00:00
Ingo Schommer
064816240f ENHANCEMENT: moved styling not specific to security-form to Form.css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42729 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:58:09 +00:00
Ingo Schommer
1e332e6dbe !!BUGFIX: Refactored CSS and Requirements: Created more specific css-files to reduce side-effects and ease debugging, moved generic form-styling from cms/css/cms_*.css into sapphire/css/Form.css.
!!BUGFIX: Ordered Requirement-inclusions in CMSMain/LeftAndMain to be more coherent (avoiding duplicate Requirement-calls)
ENHANCEMENT: Removed some css-rules disabled by comments
ENHANCEMENT: coding-conventions (see r42726)
FEATURE: Added Profile-page with LeftAndMain->myprofile()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42728 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:56:55 +00:00
Ingo Schommer
6f0d5a8155 additional check for existence of #sitetree
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42726 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:48:28 +00:00
Ingo Schommer
77cebb3352 added get_existing_translations(), adapted to coding conventions
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42725 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-27 20:47:16 +00:00
Ingo Schommer
eb45e6ec6d added $default_locale and get_translatable_modules()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42578 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 22:14:48 +00:00
Ingo Schommer
0e968ca308 Fixed ticket #85: Dropdown on /status/CMS should be sorted alphabetically. Now all language dropdowns are sorted by language name rather than language code (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42576 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:57:54 +00:00
Ingo Schommer
ff9a292d51 Added the correct English name of some rare languages (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42575 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:57:23 +00:00
Ingo Schommer
a0723f23f9 Use the standard _manifest_exclude rather than a specific solution (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42574 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 21:56:45 +00:00
Sam Minnee
fad2ab3eda Updated and improved StaticExporter
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42536 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-25 03:44:07 +00:00
Ingo Schommer
0bf09f0df0 removed DriversLicense references from LoginForm (guess thats leftovers from perweek-client)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42367 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-21 00:07:15 +00:00
Ingo Schommer
e7993a1bb0 BUGFIX: removed Security::get_default_username() and Security::get_default_password()
had rather severe security implications due to the way PHP handles static methods as instance methods,
combined with silverstripe's url->method-mapping
(EPIC FALE! on my behalf...)
added Security::checkDefaultAdmin()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42204 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-17 21:51:42 +00:00
Ingo Schommer
852d09d5f3 fixed wrong usage of type-casting which caused apache to segfault
changed die() to user_error()

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42162 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:54:31 +00:00
Ingo Schommer
f1285c839d fixed php notices, meaningful heredoc-modifiers
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42159 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 20:35:04 +00:00
Ingo Schommer
ddb0136c62 MERGE-FIX: updated requirements
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42157 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:41:36 +00:00
Ingo Schommer
6205cff4f1 Changed $username/$password to $default_username/$default_password,
respecting Security::setDefaultAdmin() in MemberAuthenticator? 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42156 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:39:41 +00:00
Ingo Schommer
2271dc5d4a mlanthaler: Refactored the created code since the coding conventions for static methods were changed (ticket #49).
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42155 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:30:12 +00:00
Ingo Schommer
c4ab634207 Checking for static $enabled when processing $versionableExtensions,
as db/build was failing when Translatable::$enabled=false 
Fixed indentation in augumentDatabase() 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42154 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:24:51 +00:00
Ingo Schommer
53016680d5 isset()-check in ready()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42153 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:24:24 +00:00
Ingo Schommer
266ff8a796 Added disable()
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42152 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:23:59 +00:00
Ingo Schommer
48eaf7f0bc reverted css-change from r40642 (belongs into sapphire-css-files)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42149 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 17:01:34 +00:00
Ingo Schommer
1b2475d9b2 bfojcapell: Refactoring
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:58:19 +00:00
Ingo Schommer
39ae17224a bfojcapell: Fixed "Notice: Object of class HTTPResponse to string conversion" that caused nothing to be written in the static file.
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42146 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-09-16 16:57:40 +00:00