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

1188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
18175b030a Merge pull request #720 from KB1RMA/add-editorconfig 
Add .editorconfig to encourage pretty and uniform code!
 2014-10-27 19:09:51 +11: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
Chris Snyder
35dcb24465 Add editorconfig 2014-10-24 13:04:32 -04: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
5fee82210a Fixes #709 - Update fa lang 2014-10-24 19:05:50 +11:00
Sam Georges
04059c20fc Merge branch 'develop' 2014-10-24 19:03:03 +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
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
9a7d8cfb4f Merge pull request #715 from NemoD503/translate 
Translate for RU Mailgun tab in mail settings
 2014-10-24 18:57:13 +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
n.kolesnichenko
b3bc16cc4d Translate for RU Mailgun tab in mail settings 2014-10-23 17:04:25 +04: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