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

113 Commits

Author SHA1 Message Date
Samuel Georges
0d8a30730e Introduce scope "switch" type, allow options to be passed 2016-04-27 19:09:19 +10:00
Samuel Georges
87a4de40de Address serialize/unserialize issues 
This will require a cache clear for the combiner
Ref https://davidwalsh.name/php-serialize-unserialize-issues
 2016-04-16 08:22:31 +10:00
Samuel Georges
c5362652c1 Begin the process of refitting brand settings 
Introduce secondary and accent colors
Switch some CSS to use the new storm utils
Other minor improvements
 2016-04-05 20:04:11 +10: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
Pásztor Gábor
324875f768 Clean up 2016-03-28 15:47:29 +02:00
Samuel Georges
90ccef9b11 Minor 2016-03-26 12:39:34 +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
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
31f74adb70 suppressDirectories -> ignoreDirectories 
Add support for wildcards in ignoreDirectories
 2016-03-21 17:19:38 +11:00
Pásztor Gábor
ed1c84b8b1 PHPDoc fixes. 2016-03-04 16:50:58 +01:00
alekseybobkov
27c7f4d0b8 Fixes a bug with inserting Media objects to the rich editor in Safari. Closes #1733 2016-03-02 21:10:27 -08:00
alekseybobkov
387c75c5cd Fixed a bug where changing a letter case in a folder name in Media Manager deletes the folder. Added ability to move files and folders to the root directory in Media Manager. Fixed a bug where numeric folder names are displayed incorrectly in the folder path in Media Manager. Fixes #1765, fixes #1173, fixes #1085. 2016-02-29 21:50:07 -08:00
Samuel Georges
1241f584d0 Merge remote-tracking branch 'remotes/origin/stable' into ui 2016-03-01 07:02:07 +11:00
Samuel Georges
fd16f38b11 Implement file definitions (extensions + ignore files) 
Block "unsafe" extensions from being uploaded to the Media manager
Fixes #1801
 2016-02-29 18:12:26 +11:00
alekseybobkov
00ced6c79f UI update 2016-02-28 19:52:21 -08:00
Samuel Georges
8e9ae8e53e Clean up from #1631 
- Files in the media library can now contain two dots
- Retina Images Support
 2016-02-27 14:49:38 +11:00
Samuel Georges
423360b2d2 Merge pull request #1631 from JoelESvensson/develop 
Files in the media library can now contain two dots
 2016-02-27 14:36:38 +11:00
alekseybobkov
a943708b99 UI updates 2016-02-19 22:12:41 -08:00
Derek Bourgeois
4797364a04 Update AssetList.php 
Allow .otf and .woff2 font formats by default. These file types are included in popular packages such as Bootstrap and Font Awesome.
 2016-02-15 10:37:56 -05:00
Joel E. Svensson
ed583491e0 Fixes #1681 
Added a customzied slug-function to MediaManager which supports @-signs
 2016-01-23 20:36:05 +01:00
Samuel Georges
8d7c90bebf Merge pull request #1489 from Flynsarmy/filterByFolder 
Show matching folders when filtering CMS objects. Ref #1466
 2015-12-05 08:24:13 +11:00
Samuel Georges
5c294b78bd Add support to extend query on 'nested' sortMode - refs #1519 
Recompile assets, minor cleanup
 2015-10-17 12:44:16 +11:00
Samuel Georges
6203970122 Progress bar should turn red on error - refs #1518 
Tidy up progress bar control, streamline brand colours
 2015-10-17 12:17:10 +11:00
Oliver Vartiainen
9f2e50c4eb Display media manager upload errors more clearly 
* Differentiate between successful and failed uploads
* Add a function for updating upload bar status
* Add a new upload error text

Fixes #1349
 2015-10-14 21:06:17 +03:00
Samuel Georges
1774f12e65 Minor styling fix 2015-10-07 07:22:16 +11:00
flynsarmy
3e37c9307f Show matching folders when filtering CMS objects. Ref #1466 2015-10-05 12:12:11 +10:00
jBOKA
2bfcec811f Updated AssetList widget to use correct folder permissions 2015-09-20 06:03:42 +02:00
Samuel Georges
ab4abb9bc5 Minor 2015-09-19 06:17:31 +10:00
Vladimir Kattsov
9fee6346df Update MediaManager.php 
Transform extension like JPG and etc to lower case
 2015-09-19 06:04:25 +10:00
Samuel Georges
793bf30c26 Decouple the toolbar from the layout system 2015-08-26 20:24:37 +10:00
Samuel Georges
60c18d39df Remove dependency on sweet alert 2015-08-22 13:48:53 +10:00
Samuel Georges
742ae07391 Tidy up from #1377 2015-08-22 08:47:35 +10:00
Vladimir Kattsov
7c39a1ae74 Update MediaManager.php 
If name of our upload file not latin
 2015-08-17 18:35:43 +03:00
Samuel Georges
0e3403f1aa Use a nicer syntax for <html lang="" /> 
Recompile assets
 2015-08-15 09:49:51 +10:00
Jérémy GAULIN
3f8d17995a Translate alert messages. Switched to sweetAlert.alert() instead of raw window.alert(). 
Override `swal` and `sweetAlert` functions to set translation on default buttons.

Changed `sweetAlert()` to `swal()` to be consistent with `mediamanager.js`
 2015-08-15 09:46:24 +10:00
Samuel Georges
b8bc6c6d99 Allow the "go up" link to be selected with the mouse - Refs #1360 
This will disable the move and delete buttons
 2015-08-15 09:17:30 +10:00
Jofry
8973761146 Merge pull request #1 from jofrysutanto/master 
Show mediamanager sidebar preview when "Go up" is selected.
 2015-08-08 22:57:21 +10:00
jofrysutanto
871f824582 Show mediamanager sidebar preview when "Go up" is selected. 
Show more informative sidebar information when "Go up' is selected, instead of blank file information with 'null' public url.
 2015-08-08 22:52:21 +10:00
Samuel Georges
2cf1d707ad The API response for insert / insert+crop should be identical 
This is because the 'onInsert' callback is used for both actions, yet yielded different results causing breakages
Fixes #1281
Also improved code readability in some places
 2015-08-08 11:17:56 +10:00
Samuel Georges
b010732796 These methods should be protected, update client lang 2015-08-04 10:01:17 +10:00
Samuel Georges
8cd97b27a6 Add prettify, update Ace, recompile assets 2015-08-03 19:00:45 +10:00
Samuel Georges
3e898064e1 Translate some client side strings 2015-08-03 18:59:37 +10:00
Samuel Georges
f47b99d183 Move storm to its own build 2015-07-29 19:13:42 +10:00
Samuel Georges
96959e0683 Fixes bug in IE11 that prevents use of Media Manager - Fixes #1198 
Add mediamanager less to bundles
 2015-06-27 12:24:19 +10:00
Samuel Georges
0a5e6adad1 Fixes tooltip background color 
Other minor clean ups
 2015-06-09 18:49:56 +10:00
Samuel Georges
99146294aa Minor touch ups 
Add danger style to popover
 2015-06-06 16:49:30 +10:00
Samuel Georges
bed7d0825f Fixes loading animation in various places 2015-06-03 19:22:18 +10:00