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

1070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Georges
7b171ed3d8 Merge pull request #714 from Flynsarmy/develop 
Make dump show object type
 2014-10-24 18:58:04 +11:00
Samuel Georges
ec8c6610f7 Merge pull request #717 from Reizinixc/patch-2 
Fix typo in app/config/cms.php
 2014-10-24 18:56:44 +11:00
Sam Georges
49982b51ed Clean up code, add listExtendColumns override 2014-10-24 17:15:34 +11:00
Sam Georges
a8daa5b4a7 Fixes the system settings icon 2014-10-24 16:38:36 +11:00
Reizinixc
3a936f6b4e Fix typo in app/config/cms.php 
Sepcific -> Specific
 2014-10-24 07:32:51 +07: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
b312d53d85 * Build 158 2014-10-23 08:05:48 +11:00
Sam Georges
16bfb8a5e6 Revert icon change 2014-10-22 14:26:24 +11:00
Sam Georges
59ba8af24b Go back to old icons 2014-10-22 14:24:31 +11:00
Sam Georges
32adc79924 Revert to FA-only icons 2014-10-22 14:22:41 +11:00
Sam Georges
578f1c0945 Update icons 2014-10-22 14:15:21 +11:00
Sam Georges
167eb74474 Fixes logic bug 2014-10-21 20:22:04 +11:00
Sam Georges
677030c5fa Update Font Autumn icon pack 2014-10-21 20:21:39 +11:00
Sam Georges
f8c2fa30b4 Fixes an issue where new Themes attached to a project were not being installed on update. 2014-10-21 19:21:17 +11:00
Sam Georges
b45730e1d9 Fixes issue where XDebug aborts the thread for maximum function count. 2014-10-21 19:20:55 +11:00
Sam Georges
a9eecfecd5 Remove blueimp uploader, replaced with dropzone.js 2014-10-20 18:55:31 +11:00
Sam Georges
ab712f44fb Fixes omitted visibility 2014-10-20 18:54:28 +11:00
Sam Georges
23f6d75416 Peer review of #679 2014-10-19 10:58:18 +11:00
Samuel Georges
b30d85df2d Merge pull request #679 from stefantalen/feature/PSR-2 
[WIP] Updating code to match PSR standards
 2014-10-19 10:25:15 +11:00
Stefan Talen
018e0a4172 Updating plugin folder 2014-10-18 12:49:29 +02:00
Stefan Talen
0a05e08a38 Fixing issues with files in modules/backend 2014-10-18 12:05:51 +02:00
Stefan Talen
509e7d2a12 Fixing issues with files in modules/cms 2014-10-18 12:03:48 +02:00
Stefan Talen
f85087eac6 Updating modules/system 2014-10-18 11:58:50 +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
Sam Georges
2689a3e669 Be more specific about pathing, minor improvement to system settings table 2014-10-18 13:39:33 +11:00
Sam Georges
fff64a30a7 FormWidget registrations use a "code" not an "alias", it is confusing with defaultAlias property in widgetbase 2014-10-18 10:47:36 +11:00
Sam Georges
d74a15b297 Update font autumn to latest 2014-10-17 17:33:59 +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
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
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
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