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

53 Commits

Author SHA1 Message Date
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
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
Vojta Svoboda
3ea76dd817 Remove duplicate array keys 2015-10-04 22:09:57 +02:00
Samuel Georges
57f32d0055 Adds basic permissions for media manager - Fixes #1134 
Note if media management is restricted, it can still be accessed via the Rich Editor - we need to address this concern later. This change is to allow the menu item to be toggled on/off.
 2015-06-27 11:50:46 +10:00
Samuel Georges
e6f70eafdd Translate prompt for FileUpload + MediaFinder 
Remove redundant language key
Recompile assets
 2015-06-20 22:21:18 +10:00
gergo85
7ab72b3743 Improve multilanguage support 2015-05-16 11:47:24 +02:00
gergo85
cb670237f2 Improve multilanguage support 2015-05-04 13:29:48 +02:00
alekseybobkov
06e5dce96a Fixed a conflict in framework.js. Closures in the script are named now, for the memory profiling needs. 
Conflicts:
	modules/system/assets/js/framework.js
 2015-04-11 18:58:24 -07:00
alekseybobkov
c1740c479c Media Manager: implemented insert link, insert image, and crop and insert features. Minor fixes in October core and third-party JS plugins. 2015-04-11 18:55:02 -07:00
Samuel Georges
d283d6b143 Merge remote-tracking branch 'remotes/krisawzm/develop' into develop 
Conflicts:
	modules/backend/models/BackendPreferences.php
	modules/system/lang/ru/lang.php
	modules/system/lang/sv/lang.php
 2015-04-11 10:48:59 +10:00
alekseybobkov
790b464679 Merge branch 'develop' into media-manager 2015-04-04 19:01:08 -07:00
alekseybobkov
332d92f538 Implemented image inserting to Redactor. 2015-04-04 18:59:36 -07:00
Samuel Georges
c54821f175 Overhaul the plugin installation process in the back-end 
Themes can now be installed via the back-end
 2015-04-04 17:28:51 +11:00
alekseybobkov
9ed3d03484 jQuery in the back-end updated to v.2.1.3. Fixed several memory management issues in select2 (an event attached to the mask element is never unbound), framework.js (onunload event attached to window is never unbound and holds references to the Request instances). Added popup adaptive size option. Started media manager popup API. 2015-03-29 18:56:06 -07:00
krisawzm
4c723ac48f Another typo 2015-03-26 22:31:21 +01:00
alekseybobkov
1e5c34b702 Added the empty Library message. 2015-03-22 22:37:51 -07:00
alekseybobkov
86b9f58465 Implemented folder and file moving. 2015-03-22 13:07:37 -07:00
alekseybobkov
f7d08f1197 Implemented folder creation, fixed a minor issue with selecting items, added a new event to the Popup control. 2015-03-21 23:09:33 -07:00
alekseybobkov
cd0b107a2b Implemented file and folder renaming 2015-03-21 16:14:26 -07:00
alekseybobkov
331276c244 Implemented file and folder deletion 2015-03-18 22:20:53 -07:00
alekseybobkov
e2a9c25b65 Implemented search. 2015-03-17 22:20:04 -07:00
alekseybobkov
03c46012dc Merge branch 'develop' into media-manager 2015-03-17 19:30:57 -07:00
alekseybobkov
4e1217e2de Implemented item sorting. Minor fix in the drop-down list styling. 2015-03-16 21:49:39 -07:00
Samuel Georges
851d421092 Update various language references 2015-03-16 19:33:58 +11:00
alekseybobkov
44c08b76f9 Implemented file uploading 2015-03-15 21:54:39 -07:00
alekseybobkov
78ad303236 Merge branch 'develop' into media-manager 
Conflicts:
	composer.json
	modules/backend/assets/css/october.css
	modules/backend/assets/less/controls/lists.less
	modules/backend/assets/less/october.less
	modules/backend/widgets/Form.php
	modules/backend/widgets/form/partials/_field.htm
 2015-03-15 13:06:50 -07:00
alekseybobkov
18e058ad59 Added the Media tab, minor update in .htaccess to allow temporary public directory to be accessible; implemented the basic UI components and navigation; implemented grid, list and tiles view modes; implemented drag-select interface; implemented Media Library cache refreshing; implemented thumbnail generating for local and remote media files; fixed memory leak in third-party Flot Resize library; minor update in the AJAX framework - AJAX request cancelling is not considered as an error anymore; added back-end UI components for creating panels. 2015-03-15 12:52:03 -07:00
Samuel Georges
9b8e1ce3c1 Improve theme list to allow editing properties 2015-03-14 18:09:54 +11:00
Samuel Georges
a8389fb1aa Tooltip now auto initializes 
initForm can now pass context
Various improvements and bug fixes
 2015-03-12 20:50:16 +11:00
alekseybobkov
1c273f28ba Implementing the MediaLibrary class, in progress 2015-02-24 22:02:03 -08:00
gergo85
c43680b2ef Improve multilanguage support and cleanup 2014-12-19 10:28:27 +01:00
Samuel Georges
70eb7eaf51 Adds Theme customization feature 
Adds reset button to settings pages
authorUrl -> homepage
 2014-12-04 16:49:52 +11:00
webmaxx
b4819e73b3 Added new symbols to page slug regexp in the backend. 
Example slug:
/news/:page?|^[0-9]+$ - "/news/", "/news/2"
 2014-11-19 12:04:55 +04:00
Sam Georges
ba166a0cf9 Add counter labels and maintenance settings page to Cms provider + Language files, update CHANGELOG.md with changes 2014-11-10 20:35:20 +11: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
57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
Stefan Talen
e114f29582 Updating modules/cms/lang 2014-10-11 01:32:11 +02:00
Sam Georges
20e279bf4c Page URLs now support dots (.) 
Add hook for cms.page.init
 2014-08-21 19:47:29 +10:00
Paul Wilde
1d038d3173 More translation strings. 2014-08-12 01:15:38 +01:00
Sam Georges
13587f155c Move trans from logic-less array to inside business logic. Convert tabs to spaces. 2014-08-09 12:21:17 +10:00
Paul Wilde
906370c6bd Added translation strings for permission labels, mail template/layout column labels, editor fullscreen, list pagination and list setup modal. 2014-08-09 03:02:15 +01:00
Sam Georges
3f31eed160 Add more detailed error for saving cms objects. 2014-08-03 10:52:46 +10:00
Sam Georges
7cd80f8a59 Throw an error when the active theme is not found 2014-07-23 11:33:19 +10:00
Sam Georges
04888b2b93 Minor 2014-07-19 15:54:09 +10:00
alekseybobkov
c324c80969 Added the theme selector 2014-07-19 13:05:50 +11:00
alekseybobkov
7056397036 Implemented the hidden page flag. Closes #34. Closes #88. 2014-07-03 17:40:44 +11:00
Sam Georges
91ecb55ca3 Tidy up #314 2014-06-17 19:13:25 +10:00
Louis Matthijssen
bbd2915637 Improve the access denied (403) page 
This is an improved version of the current access denied (403) page based on the built-in not found (404) page.

Shows a link to the CMS backend if the user is logged in and doesn't have permissions for the backend page it's trying to access, but does have permissions for the CMS backend.

Please note that the following languages are machine translated: ja, pt-br, ru and sv.
 2014-06-16 22:58:37 +02:00
Sam Georges
12a80cae9c Add new keys to other languages (needs further translation) 2014-05-16 11:29:44 +10:00
Samuel Georges
f02b541d2f Merge pull request #111 from erJasp/master 
Moved hard-coded text to language file (backend)
 2014-05-16 11:06:57 +10:00