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,012 Commits 35 Branches 172 Tags
Commit Graph

1012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sam Georges
d741b7bd60 Missing language keys 2014-10-17 08:25:28 +11:00
Sam Georges
df98ae9196 Use getQualifiedKeyName when finding existing IDs 2014-10-17 08:15:16 +11:00
Sam Georges
6e827b4c8c Merge branch 'master' into develop 2014-10-17 08:14:04 +11:00
Samuel Georges
c48e10cbf5 Merge pull request #701 from karnold/develop 
when building belongsToMany relationships in controllers, the lack of a ...
 2014-10-17 08:13:19 +11:00
Samuel Georges
1a5c277c30 Merge pull request #700 from negativa/patch-1 
Rename Datepicker.php to DatePicker.php
 2014-10-17 08:11:12 +11:00
Sam Georges
6e584ecc56 Customize backend should style the breadcrumb 2014-10-17 07:57:43 +11:00
Kris Arnold
c75df3a120 when building belongsToMany relationships in controllers, the lack of a table name 
alias causes an sql ambigious Id error
 2014-10-16 14:28:36 -05:00
Dmitriy
d055bbedaa Rename Datepicker.php to DatePicker.php 2014-10-16 22:03:10 +03:00
Sam Georges
3e48ba945f * Build 155 2014-10-16 19:57:53 +11: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
1203043a45 Cache BrandSettings compiled CSS 2014-10-16 19:49:29 +11:00
Sam Georges
fbaab26bfb Improve efficiency in settings model behavior 2014-10-16 19:49:28 +11:00
Samuel Georges
56e6620a35 Merge pull request #695 from erikthedeveloper/fixup/minor_documentation 
Fixes typo (Licence) and missing space in README.md
 2014-10-16 19:44:43 +11:00
Erik Aybar
69d7893f37 Fixes missing space and typo (Licence) in README.md 2014-10-15 18:50:19 -06:00
Sam Georges
b55cfa0aff Use contain 2014-10-15 20:03:12 +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
82192c3e55 Add light/dark variations of primary/secondary colors 2014-10-15 08:10:38 +11:00
Sam Georges
57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
Samuel Georges
3a7cc9f7aa Merge pull request #686 from DallasMuseumArt/upstream 
fixed language reference in dialog box for plugin disable form
 2014-10-14 07:50:44 +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
3ec4a2a82f Add LESS ability to rendering custom backend less 2014-10-13 19:05:23 +11:00
Sam Georges
d194f34cf8 Merge branch 'develop' into customize-backend 2014-10-13 18:35:39 +11:00
Sam Georges
640dc04cf5 Dedicated layout partial for custom styles 2014-10-13 16:09:07 +11:00
Sam Georges
dd5a46d815 Refs #599 - Adds method to get the list widget object from the controller 2014-10-11 18:06:14 +11:00
Sam Georges
153fcfbb13 Refs #598 - Ignore phantom columns stored in preferences 2014-10-11 17:58:48 +11:00
Sam Georges
cf352bfe1a Fixes #657 - Add Redis service provider 2014-10-11 16:53:51 +11:00
Sam Georges
f03db8be5d Fixes #669 - Labels in filter do not translate 2014-10-11 16:38:23 +11: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
d92268b516 Oops, broke the switch 2014-10-11 14:32:30 +11:00
Sam Georges
71f9df8e13 Use HTML to pass unchecked checkboxes/switches. Refs #648 2014-10-11 14:31:09 +11:00
Samuel Georges
182bb01167 Merge pull request #648 from Flynsarmy/checkboxZeroVal 
Send a 0 value when a checkbox is unchecked
 2014-10-11 14:21:43 +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
3836a9b8d7 Refs #679 - Fixed Visibility must be declared on property issues 2014-10-11 12:27:21 +11:00
Sam Georges
1dcaa0d1d6 Fixes #677 - use FQN for "instanceof Model" expressions 2014-10-11 12:13:25 +11:00
Sam Georges
4504d5bf4c Improve translation handling 2014-10-11 10:37:48 +11:00
Sam Georges
fd547bb485 We can't sort by relation fields anymore 2014-10-11 08:44:30 +11:00
Sam Georges
463b971fbf Fixes #674 - Add koala to readme 2014-10-10 09:04:12 +11:00
Sam Georges
1c4706bbbb Fixes unit tests so they pass 2014-10-09 18:08:28 +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
Sam Georges
7e62ef5925 Refs #670 - Attempt fix 2014-10-09 17:14:29 +11:00
Sam Georges
f5eff8d74d Update changelog 2014-10-09 08:36:18 +11:00