Commit Graph

287 Commits

Author SHA1 Message Date
Sam Georges 98e100b377 Refs #729 - Fixes CMS permissions, should not show "pages" content by default 2014-11-09 12:35:10 +11:00
Sam Georges 7357954c84 Proposed fix for handling defaults when parsing external properties 2014-11-04 12:33:38 +11:00
jtherczeg bb25a1a82c Hungarian language files for modules committed 2014-11-03 09:41:09 +01:00
Sam Georges c83797231d Subsequent expressions are on a new line (see developer guide > PSR exceptions) 2014-11-01 12:00:45 +11:00
Sam Georges 03e9f48333 Deprecate propertyOrParam 2014-10-31 20:01:17 +11:00
Sam Georges afcf50a585 noExternalParameter -> showExternalParameter 2014-10-31 19:57:07 +11:00
Sam Georges ac37d23d14 Tidy up code a lil 2014-10-30 16:54:56 +11:00
alekseybobkov 2a771190ea Merge branch 'develop' into dynamic-partials 2014-10-29 22:14:31 -07:00
alekseybobkov 9a05a408c9 Added support for components in partials 2014-10-29 22:12:42 -07:00
Samuel Georges ecf84b48e1 Merge pull request #723 from alvaro-canepa/patch-1
Add Spanish language support
2014-10-27 19:07:10 +11:00
alvaro.canepa d9c06c9ed5 Spanish language support 2014-10-24 23:02:38 -02:00
Sam Georges a00cb9f556 (7:15:01 PM) Flynsarmy: i feel component should also show the subheader too 2014-10-24 19:17:21 +11:00
Sam Georges 7cb8bf0d9a Improve code a tiny bit 2014-10-24 19:11:44 +11:00
Sam Georges 688d8c95de Comply PSR 2014-10-24 19:01:30 +11:00
Sam Georges 38f8aab27c Comply PSR 2014-10-24 19:00:44 +11:00
flynsarmy f869c7d268 Make dump show object type 2014-10-23 20:32:55 +10:00
Sam Georges 4ac6469200 Original data does not exist for new objects 2014-10-23 08:11:11 +11:00
Sam Georges 59ba8af24b Go back to old icons 2014-10-22 14:24:31 +11:00
Sam Georges 578f1c0945 Update icons 2014-10-22 14:15:21 +11:00
Sam Georges a9eecfecd5 Remove blueimp uploader, replaced with dropzone.js 2014-10-20 18:55:31 +11:00
Sam Georges 23f6d75416 Peer review of #679 2014-10-19 10:58:18 +11:00
Stefan Talen 509e7d2a12 Fixing issues with files in modules/cms 2014-10-18 12:03:48 +02:00
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 ed552f1591 Minor code clean 2014-10-18 15:52:44 +11:00
Sam Georges 8ee28b214d Minor code clean 2014-10-18 14:32:06 +11:00
alekseybobkov d4bc164fb2 Display the default placeholder content if there is no put tag for the placeholder 2014-10-16 22:36:00 -07:00
alekseybobkov 219f1ff8f7 Merge branch 'develop' into static-pages-support
Conflicts:
	modules/backend/assets/less/controls/filelist.less
2014-10-16 21:03:20 -07:00
alekseybobkov 12175b29db Multiple updates in the back-end widgets and styles 2014-10-16 20:47:23 -07: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 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
Stefan Talen acf2304ce2 Fixing test SectionParserTest::testParseOffset 2014-10-12 14:23:47 +02:00
Stefan Talen 230a7377cf Updating files in modules/cms 2014-10-11 14:33:40 +02:00
Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2
Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
2014-10-11 11:58:20 +02:00
Sam Georges 062ce2f50a Closes #673 - Add Argentine Spanish (es-AR) locale 2014-10-11 16:32:51 +11:00
alekseybobkov 0b8af1f505 Merge branch 'develop' into static-pages-support 2014-10-10 22:27:01 -07:00
alekseybobkov 0b2481560b Merge branch 'develop' of github.com:octobercms/october into develop 2014-10-10 21:21:05 -07:00
alekseybobkov 8339323870 Fixes the bug where finding a component by class name is not possible if the component has an alias 2014-10-10 21:20:46 -07:00
Sam Georges 1dcaa0d1d6 Fixes #677 - use FQN for "instanceof Model" expressions 2014-10-11 12:13:25 +11:00
Stefan Talen 40640d1923 Updating single files in modules/cms 2014-10-11 01:56:53 +02:00
Stefan Talen 634865e42e Updating modules/cms/widgets 2014-10-11 01:53:40 +02:00
Stefan Talen 9c1dcb0dba Updating modules/cms/twig 2014-10-11 01:42:04 +02:00
Sam Georges 4504d5bf4c Improve translation handling 2014-10-11 10:37:48 +11:00
Stefan Talen e114f29582 Updating modules/cms/lang 2014-10-11 01:32:11 +02:00
Stefan Talen 2f04fcd524 Updating modules/cms/formwidgets 2014-10-11 01:29:22 +02:00
Stefan Talen e9ce6f5d54 Updating modules/cms/controllers 2014-10-11 01:27:52 +02:00
Stefan Talen 202e8869b1 Updating modules/cms/classes 2014-10-11 01:22:03 +02:00
Sam Georges 1c4706bbbb Fixes unit tests so they pass 2014-10-09 18:08:28 +11:00
Sam Georges 7e62ef5925 Refs #670 - Attempt fix 2014-10-09 17:14:29 +11:00
sajjad-ser 1cf70bf032 Add Persian Translate 2014-10-07 17:37:37 +03:30