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

777 Commits

Author SHA1 Message Date
Sam Georges
212d28d66b Refs #725 - Remove ace modes we don't use 2014-11-01 17:11:15 +11:00
Sam Georges
5370fff189 Update permissions 2014-11-01 16:27:03 +11:00
Sam Georges
e81b7394b1 Fixes #733 - Be more considerate of others 2014-11-01 16:15:17 +11:00
alekseybobkov
3a806b7ee0 Improvement in the Inspector external parameters support 2014-10-31 22:01:27 -07:00
Sam Georges
2011a21e6f Minor 2014-11-01 12:03:38 +11: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
e7c33467f3 Give the compiled CSS it's own cache pipe so it doesn't conflict with the deferred binding workflow 2014-11-01 10:26:43 +11:00
Sam Georges
8cb512e8dd Fixes #702 - Prevent browser from trying to load empty logo ref 2014-11-01 10:18:19 +11:00
Sam Georges
afcf50a585 noExternalParameter -> showExternalParameter 2014-10-31 19:57:07 +11:00
Sam Georges
832a92e925 Revert change 2014-10-30 17:39:08 +11:00
alekseybobkov
f3ab4595b2 Merge branch 'develop' of github.com:octobercms/october into develop 2014-10-29 23:36:20 -07:00
alekseybobkov
85df6bfb62 Fix in the Inspector 2014-10-29 23:36:07 -07:00
Sam Georges
9c253a7d67 Wording change 2014-10-30 17:24:57 +11:00
alekseybobkov
3deb4ee654 Minor fix in the Inspector code 2014-10-29 23:09:13 -07: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
0bc63fe8a3 Merge pull request #722 from patrickward/develop 
Correction: change $relatedLabel variable to $relationLabel in pivot for...
 2014-10-27 19:07:27 +11: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
Sam Georges
1c6d48ffa8 Fixes a strange issue where a <button> inside a nested <form> will trigger the event twice (1 for button, 1 for form) 2014-10-27 17:59:53 +11:00
alvaro.canepa
d9c06c9ed5 Spanish language support 2014-10-24 23:02:38 -02:00
Alvaro Cánepa
2f47ce84a7 Add Spanish language support 2014-10-24 22:25:19 -02:00
Patrick Ward
90313deb53 Correction: change $relatedLabel variable to $relationLabel in pivot form. 2014-10-24 15:07:42 -04:00
Sam Georges
5fee82210a Fixes #709 - Update fa lang 2014-10-24 19:05:50 +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
Sam Georges
16bfb8a5e6 Revert icon change 2014-10-22 14:26:24 +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
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
0a05e08a38 Fixing issues with files in modules/backend 2014-10-18 12:05:51 +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
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
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
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
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
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
Sam Georges
b55cfa0aff Use contain 2014-10-15 20:03:12 +11:00