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

2816 Commits

Author SHA1 Message Date
Samuel Georges
8dd2e97cf7 ~1.0 -> dev-develop 2016-04-01 14:07:43 +11:00
Samuel Georges
a548d6ee56 Merge remote-tracking branch 'remotes/origin/stable' into develop 
Conflicts:
	modules/backend/lang/en/lang.php
	modules/backend/lang/fr/lang.php
 2016-04-01 13:00:32 +11:00
Samuel Georges
b51b5a112e dev-stable -> ~1.0 2016-04-01 12:52:11 +11:00
Samuel Georges
ea5193e4c8 Merge pull request #1887 from gpasztor87/ui 
Update AssetList + Clean up
 2016-03-31 07:41:05 +11:00
Pásztor Gábor
ef228c4915 Minro style improvements 2016-03-30 21:29:30 +02:00
Pásztor Gábor
9f3fcf27ed Update AssetsList 2016-03-30 18:17:18 +02:00
Pásztor Gábor
40269cb6e2 Clean up 2016-03-29 14:55:25 +02:00
Samuel Georges
5a9d62d54a Merge pull request #1882 from gpasztor87/patch-1 
Clean up
 2016-03-29 23:08:47 +11:00
Samuel Georges
76e16e8001 Merge pull request #1879 from gpasztor87/ui 
Fix error in Maintenance Settings
 2016-03-29 19:18:11 +11:00
Samuel Georges
7affc4bec8 Apply layout to unregistered mail templates 2016-03-29 18:17:25 +11:00
Samuel Georges
11cf46008f Adds core changelog to update screen 2016-03-29 17:44:48 +11:00
Pásztor Gábor
324875f768 Clean up 2016-03-28 15:47:29 +02:00
Pásztor Gábor
87a5ff339e Fix error in Maintenance Settings 2016-03-28 15:41:47 +02:00
Samuel Georges
2ac23cc3c7 More peer review of #1856 
Separation of concerns, the language file shouldn't really be treated as a data source for the supported encoding options.
 2016-03-26 14:28:34 +11:00
Samuel Georges
a035acdc2c Tidy up some logic, restore firstRowTitles setting 
Refs #1856
 2016-03-26 14:10:05 +11:00
Jérémy Gaulin
2a60e34558 Import options to configure the CSV reader + patch to prevent unfriendly error to be thrown due to bad import source file encoding (on AJAX request) 2016-03-26 12:54:13 +11:00
Samuel Georges
1785c6c0d8 pikaday -> datepicker 2016-03-26 12:53:45 +11:00
Samuel Georges
8e14b9b649 Recompile assets 2016-03-26 12:40:55 +11:00
Jérémy GAULIN
f836b43bb3 Pikaday translation 2016-03-26 12:39:57 +11:00
Samuel Georges
90ccef9b11 Minor 2016-03-26 12:39:34 +11:00
Samuel Georges
6f6a3cc78c Merge pull request #1855 from gabsource/enchancement/import-export-french-translation 
French translations for import/export errors strings
 2016-03-26 12:38:42 +11:00
Samuel Georges
86d4ae491e Minor 2016-03-25 18:42:39 +11:00
Samuel Georges
2a7dbdd74a Merge branch 'stable' into ui 
Conflicts:
	modules/cms/classes/CmsObject.php
	modules/cms/widgets/MediaManager.php
 2016-03-25 18:42:13 +11:00
Samuel Georges
4ddc8055c6 Merge branch 'develop' into stable 2016-03-25 18:39:16 +11:00
Samuel Georges
0aef151d9a Add showSearch option to dropdown 
This is a highly specific option, so we shouldn't add it to the FormField class itself
 2016-03-25 18:21:58 +11:00
Samuel Georges
5789d0242f Fixes single image uploader breaking with comment 
Comment appears to the right of the uploader, should be under it
 2016-03-25 18:21:21 +11:00
Samuel Georges
23f4d40ef2 Merge common functionality in to FormModelWidget 2016-03-25 18:01:58 +11:00
Samuel Georges
7b32f33d9d Update to resizer class 
Refs #1694
 2016-03-25 17:31:22 +11:00
Samuel Georges
767ce5f2e7 Throw an exception when the file_data is missing from the request 
Fixes #1712
 2016-03-25 16:11:01 +11:00
Samuel Georges
a585fe3316 Share pivot|list title logic 
We already had a key for this... spooky!
Refs #1755
 2016-03-25 14:24:38 +11:00
Samuel Georges
e19ae42e45 (Rollback) Keep instances to themselves 2016-03-25 14:17:13 +11:00
Samuel Georges
762c5e754b Switch the manage popup title according to the button pressed 
Fixes #1755
 2016-03-25 14:03:11 +11:00
Samuel Georges
4fe6cc6509 Adds a clearInternalCache method to SettingsModels 
Fixes #1815
 2016-03-25 12:44:42 +11:00
Samuel Georges
0950959904 Do not show disabled plugins in the update list 
Fixes #1716
 2016-03-25 12:37:15 +11:00
Samuel Georges
010cd403f5 Detail column now supports lengthy updates 
Fixes #1816
 2016-03-25 10:59:17 +11:00
Samuel Georges
3cac52afd4 Default is null, not false 2016-03-25 10:42:14 +11:00
Samuel Georges
f1aa720086 Create a safe mode to disable code field in the CMS 
Fixes #1756
 2016-03-25 10:05:04 +11:00
Samuel Georges
680887f452 Fixes component access issue 2016-03-25 09:56:36 +11:00
Samuel Georges
7c08b10fa2 Add cms.theme.setActiveTheme event 
Bring other event names in to line with convention
Complete getConfigArray method
 2016-03-23 20:11:55 +11:00
Samuel Georges
484579ac40 Sreamline events in richeditor 
Add nwe event for visual mode (when visual mode is activated from code mode)
Always use spaces in redactor
 2016-03-23 20:10:55 +11:00
Samuel Georges
0b74734fae Make room to load theme options from files 
For example:
form: path/to/fields.yaml
 2016-03-22 20:03:00 +11:00
Samuel Georges
2a3a63857c text/javascript is obsolete. Fixes #1847 2016-03-21 19:13:01 +11:00
Samuel Georges
31f74adb70 suppressDirectories -> ignoreDirectories 
Add support for wildcards in ignoreDirectories
 2016-03-21 17:19:38 +11:00
Samuel Georges
6e7fa7de88 Allow CmsObjects to define their own Twig cache key 2016-03-21 13:42:03 +11:00
Jérémy Gaulin
8debdf023a Externalized import/export errors strings + french translation 2016-03-20 22:22:36 +01:00
Samuel Georges
4922d6d284 Retain previous listInTheme cache functionality 2016-03-20 16:04:27 +11:00
Samuel Georges
fad028bc40 Add local cmsObject.fillViewBagArray event 
Tidy up some inline docs
 2016-03-19 13:22:08 +11:00
Samuel Georges
792b7fed2a Fixes CmsException on bad INI 
No need for Cms SectionParser.php anymore
 2016-03-19 10:30:42 +11:00
Samuel Georges
c244aef2f8 Clean up 2016-03-18 19:54:27 +11:00
Samuel Georges
e9c7e6b9d1 No it is not safe to share the alias and field name... 
The field name could be nested, for example: user[data]
Using this as an alias is user[data]::onDoSomething
Resulting in an invalid AJAX handler name
 2016-03-17 19:50:34 +11:00