mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity
1,743 Commits 35 Branches 172 Tags
Commit Graph

414 Commits

Author SHA1 Message Date
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
alekseybobkov
26e8d5bda5 Minor updates in the back-end UI 2014-10-05 22:21:03 -07:00
alekseybobkov
ef9a147d31 The CMS pages are now supported by the Static Pages menus 2014-10-02 15:55:55 -07:00
alekseybobkov
762088463c Merge branch 'develop' of github.com:octobercms/october into develop 2014-09-29 22:58:55 -07:00
alekseybobkov
a534f7bc79 Fixes in the Richeditor styling. Implemented parsed content caching for content blocks. 2014-09-29 22:58:30 -07:00
Sam Georges
6363205f34 Fixes validation on Tabs and Cms pages 2014-09-29 14:04:05 +10:00
Sam Georges
bf47eb94ed Str::getRealClass -> class_basename 2014-09-29 13:12:34 +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
17f282b126 Removes deprecated code 2014-09-29 10:01:28 +10:00
alekseybobkov
dcf7bb7d4f Merge branch 'develop' into misc-tmp 2014-09-27 23:29:41 -07:00
alekseybobkov
6b42055184 Fixes in the rich editor, improved the content block rendering code, minor fixes in the popover and form styling. 2014-09-27 23:28:38 -07:00
Sam Georges
73feabaf18 Fixes unit tests, also rename October\Test to October\Tester to remove conflict between real plugin of that name 2014-09-20 17:59:19 +10:00
Sam Georges
c1d1ce49da Fixes broken icon ref 2014-09-20 17:25:21 +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
23710dbbc3 No longer lower case partial override component alias Att: @chadstrat 2014-09-19 17:23:08 +10:00
alekseybobkov
a9e2e2d80f Improvements in the CMS objects and back-end UI. 2014-09-18 20:34:24 -07:00
Sam Georges
0f544cafb2 Merge branch 'master' into develop 2014-09-18 08:23:30 +10:00
Samuel Georges
76aed53ec8 Merge pull request #611 from nnmer/master 
Additional parameters for some methods to be able to specify whether  needed absolute or relative path for the url generator
 2014-09-18 08:21:14 +10:00
Sam Georges
4f00fbdbc6 Minor. keyField -> keyFrom 2014-09-17 16:47:55 +10:00
Anton Romanov
8ee57eee76 Update Page.php 2014-09-11 12:45:37 +08:00
Anton Romanov
7ded6e5fed Update Controller.php 2014-09-11 12:44:52 +08:00
Sam Georges
44cff23009 Fixes #604 where code editor has been forcibly removed 2014-09-10 07:25:11 +10:00
alekseybobkov
9f4fa49068 Fixes a bug where saving a content block from the CMS back-end creates an empty [components] section in the file settings area. 2014-09-06 21:52:42 -07:00
Sam Georges
37e5894df2 The {% put %} tag now appends by default, The closing put tag now supports overwrite, eg: {% endput overwrite %}. 2014-09-06 17:10:52 +10:00