Commit Graph

263 Commits

Author SHA1 Message Date
Stefan Talen 347dff7e75 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
2014-10-18 11:07:17 +02:00
Sam Georges 2689a3e669 Be more specific about pathing, minor improvement to system settings table 2014-10-18 13:39:33 +11:00
Sam Georges d74a15b297 Update font autumn to latest 2014-10-17 17:33:59 +11:00
Sam Georges d741b7bd60 Missing language keys 2014-10-17 08:25:28 +11:00
Stefan Talen 06890d711a Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
2014-10-16 18:44:18 +02:00
Sam Georges 886e6fc70a Only set noInit on PluginManager for specific CLI commands (october:up, october:update) 2014-10-16 19:49:31 +11:00
Sam Georges 8d618d4e29 Fixes #684 - Plugins still load language, routes, etc when noInit is enabled 2014-10-16 19:49:30 +11:00
Sam Georges fbaab26bfb Improve efficiency in settings model behavior 2014-10-16 19:49:28 +11:00
Sam Georges cb8cad3a75 Merge branch 'customize-backend' into develop 2014-10-15 19:59:33 +11:00
Sam Georges 9f5646d273 BackendSettings -> BrandSettings
pageTitle is now translated at the end of the line
Fixed unit tests so they pass
SettingsModels are now cached
2014-10-15 19:53:44 +11:00
Sam Georges 57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
Kris Arnold 9c51b8b2a1 fixed language reference in dialog box for plugin disable form 2014-10-13 15:32:59 -05:00
Sam Georges cf352bfe1a Fixes #657 - Add Redis service provider 2014-10-11 16:53:51 +11:00
Sam Georges 062ce2f50a Closes #673 - Add Argentine Spanish (es-AR) locale 2014-10-11 16:32:51 +11:00
Sam Georges 7d313a0409 Update changelog and Fixes #582 2014-10-11 13:43:00 +11:00
Sam Georges 543f1616b7 Fixes 675 - Add |trans (Lang::get) and |transchoice (Lang::choice) filters 2014-10-11 12:31:14 +11:00
Sam Georges fd547bb485 We can't sort by relation fields anymore 2014-10-11 08:44:30 +11:00
Sam Georges d78dadafd0 Check for CLI or system/updates route and disable any plugin initialization 2014-10-09 17:46:23 +11:00
Samuel Georges ba97260aa9 Merge pull request #667 from sajjad-ser/master
Add Persian Translate
2014-10-08 18:58:05 +11:00
Samuel Georges 8a7338df83 Merge pull request #664 from egrego-dot-re/master
add mailgun support patch
2014-10-08 18:57:09 +11:00
sajjad-ser 1cf70bf032 Add Persian Translate 2014-10-07 17:37:37 +03:30
Lukasz 506ed31539 add mailgun support patch 2014-10-06 17:55:50 +02:00
Sam Georges 5c46dbec32 Plugins are now updated according to their dependency definitions 2014-10-04 15:59:43 +10:00
Sam Georges e9f5f13646 Closes #660 2014-10-04 09:56:38 +10:00
Sam Georges 8d73924fbb Add docs to class headers 2014-10-03 18:00:21 +10:00
Sam Georges 6363205f34 Fixes validation on Tabs and Cms pages 2014-09-29 14:04:05 +10:00
Sam Georges fccf4907a0 There is a bug in chrome where events are called too early 2014-09-29 13:43:21 +10:00
Sam Georges bf47eb94ed Str::getRealClass -> class_basename 2014-09-29 13:12:34 +10:00
Sam Georges 2255b9404e Adds support for Windows-based paths 2014-09-29 12:59:14 +10:00
Sam Georges aec05adc05 Add default value 2014-09-29 12:40:30 +10:00
Sam Georges 776f4dfbaf ConfigMaker now symbolizes paths 2014-09-29 12:32:41 +10:00
Sam Georges b3936330a6 Moved the PathMaker trait functionality to Filesystem class (see October Rain) 2014-09-29 12:32:07 +10:00
Sam Georges fbf5cbbb67 Moved `ViewMaker` trait to live under system, it can be useful for Models too. 2014-09-29 12:19:19 +10:00
Sam Georges 17f282b126 Removes deprecated code 2014-09-29 10:01:28 +10:00
Sam Georges beab3c3ded A defined loader should not hide when there is a redirect taking place 2014-09-28 12:23:18 +10:00
Sam Georges 8ca3483863 Refs #653 - Move sessions table to system 2014-09-28 10:29:49 +10:00
Sam Georges 2b63282658 We have a form object already, use that instead 2014-09-26 19:54:30 +10:00
Sam Georges b7e969083f Only when there is no <form /> parental element 2014-09-26 19:52:02 +10:00
Sam Georges a7d028a1a5 Welcome to the team, Indatus\Dispatcher! :-) 2014-09-26 18:45:51 +10:00
Sam Georges 3aaf50359b Add alaises for SystemException + ApplicationException, they are used so often 2014-09-26 18:10:43 +10:00
Sam Georges 746f425d88 Added new containerAttributes property to form fields 2014-09-25 18:05:35 +10:00
Sam Georges 45811dfb95 Lean code 2014-09-20 17:56:59 +10:00
Sam Georges ffc1a8490a Convert autoload refs to PSR-4 so they actually work 2014-09-19 17:23:11 +10:00
Sam Georges 5cd9f30ea2 Exception handling when plugins/ dir missing 2014-09-19 17:23:10 +10:00
Samuel Georges 5f1cee9787 Merge pull request #627 from JohnsonJackblue/patch-1
Update lang.php
2014-09-18 08:22:00 +10:00
Sam Georges aa7e1800a4 Fixes path making issue 2014-09-15 08:58:42 +10:00
JohnsonJackblue 70b6039be0 Update lang.php 2014-09-14 15:48:29 +02:00
Sam Georges 69fb8e0918 Fixes issue where load indicator hangs around on errors when a redirect is used 2014-09-13 17:47:38 +10:00
Sam Georges efbb0351db ViewMaker now uses PathMaker 2014-09-13 15:02:52 +10:00
Sam Georges c2a71e88bb Clean up some sloppy work 2014-09-12 20:20:52 +10:00