Commit Graph

983 Commits

Author SHA1 Message Date
Samuel Georges ef191d64e4 l55upgrade -> develop 2017-07-26 21:03:52 +10:00
Samuel Georges 9bb639b19f Merge branch 'l55upgrade' into develop 2017-07-26 20:59:58 +10:00
Samuel Georges 18b9253bcb Change to mail partial syntax 2017-07-26 17:48:00 +10:00
Samuel Georges 5078578a04 Rollback 205f02b44a
This keeps it as generic copypasta
With or without this, an unauthorized page is shown if the user has no permission
2017-07-22 09:46:55 +10:00
Luke Towers 205f02b44a Improve unauthorized redirection trigger case 2017-07-21 14:47:18 -06:00
Luke Towers 151ed057e8 Improve support for #2985
Improves support for editing theme options by enabling the currently active theme's customizations to be saved without a dirname in the URL.
2017-07-21 14:45:51 -06:00
Alwin Drenth c1cd76d60a Update Dutch language files (#2987) 2017-07-21 09:27:27 -06:00
Samuel Georges 7a7a1186d6 Clean up imports 2017-07-21 15:42:49 +10:00
Samuel Georges 161a1fffbb Wording change 2017-07-21 15:40:02 +10:00
Samuel Georges 3f40a6dbaf Refactor solution from #2985 2017-07-21 15:38:53 +10:00
Luke Towers 647a656f67 Add more granular permissions for editing themes (#2985)
* Add more granular permissions for editing themes
* Fix component token parser exception message
2017-07-21 14:29:30 +10:00
Samuel Georges 4fd1ca824f Introduce concept of system roles
These are roles defined by a special API code, once a system role code is detected, the role becomes locked and its permissions are sourced from the AuthManager. All permissions are granted to system roles by default, unless otherwise specified. This should make it easier to create client accounts as "Publishers", hiding developer tools like the CMS and Builder plugins by default.
2017-07-13 19:29:50 +10:00
Samuel Georges 1db67af8e8 Merge remote-tracking branch 'remotes/origin/develop' into l55upgrade
Conflicts:
	modules/system/lang/en/lang.php
2017-07-11 10:48:54 +10:00
Benjamin 89d0d29b69 Added SASS support to Resources component (#2961) 2017-07-10 17:29:11 -06:00
Max Schmitt aeba740243 Add getStatusCode() in Cms\Classes\Controller (#2959)
Related: #2953. Provide a method to access the current statusCode of a CMS controller.
2017-07-08 08:53:08 -06:00
Samuel Georges d1c160f9dc Check both instances to fix #1854
It appears there is no way around this. All directories should be lower case in October, prior to this, October wanted uppercase characters. Make up your mind guy, come on! ;-)
2017-07-01 12:26:55 +10:00
Samuel Georges 87f8f8feb1 Fixes inconsistency in component partial folder names
This is a breaking change that will require further attention - refs #1854

Eg: myComponent, the default component partial would use lower case folders
- /plugins/acme/test/components/mycomponent/default.htm

The theme component partial override would use case sensitive folders
- /themes/foobar/partials/myComponent/default.htm

This is fixed as
- /themes/foobar/partials/mycomponent/default.htm

Minor code fix to ModelBehavior class
2017-06-27 05:34:13 +10:00
Alexander Shapoval e6d79057c6 Translation into Ukrainian has been added. Added translations into Russian (#2931)
* Added Ukrainian language. Credit to @PopcornPHP for the translation.
2017-06-17 15:22:50 -06:00
Samuel Georges a2a7eec4f5 Rename methods in CollapsableWidget
The methods were far too generic. When a trait or behavior is used, it's usually a good include to include the name of the trait in the methods and properties it provides. This reduces the chance of a conflict with the implementing class.
2017-06-10 15:42:24 +10:00
Samuel Georges f020479b91 Move session logic to SessionMaker
This allows controller behaviors to access session utils
2017-06-10 04:58:29 +10:00
Priit Perna eff3f2e905 Backend translation for estonian (#2911)
* Added language files for Estonian (et). Thanks to @priitperna!
2017-06-07 11:07:34 -06:00
Samuel Georges f7d0d394f5 Merge pull request #2881 from gergo85/patch-3
Typo
2017-06-06 20:21:59 +10:00
Samuel Georges bda98e7353 Selectable box and fancy breadcrumb 2017-06-05 17:35:15 +10:00
Samuel Georges 3b56787a2b Use tabs cssClass definition instead of JS 2017-06-05 17:33:37 +10:00
Samuel Georges f672a3cf19 String to ::class 2017-06-03 10:31:24 +10:00
Samuel Georges e2781c5fdf URL -> Url 2017-06-02 23:34:50 +10:00
Samuel Georges 3be6dafa6b Fixes int folder name showing as 0
Fixes #2902
Code dusting
2017-06-02 20:16:26 +10:00
Samuel Georges 08f2e05b67 Download URL -> URL 2017-06-02 17:39:51 +10:00
Samuel Georges 01b11b73d8 Pretty useful trait, discoverable in API docs 2017-05-30 19:56:36 +10:00
Samuel Georges f0df1f458b Merge branch 'develop' into l55upgrade
Conflicts:
	modules/system/assets/ui/storm.css
2017-05-27 22:24:57 +10:00
Samuel Georges 63f1f0ac13 Merge pull request #2894 from gergo85/develop
Add imageWidth and imageHeight parameters
2017-05-27 22:10:48 +10:00
Szabó Gergő 92a5b9ab22 Add imageWidth and imageHeight parameters 2017-05-25 15:30:22 +02:00
Samuel Georges 2cbe849ee7 Style fixes 2017-05-22 20:01:09 +10:00
Samuel Georges 00ddd8e2b4 string -> ::class + docs 2017-05-20 20:01:19 +10:00
Samuel Georges cefa19af7d Backend UI improvements 2017-05-20 20:00:24 +10:00
Szabó Gergő 04e1f6e62e Typo
It is low priority changes. Yesterday I found them too, when I fixed the array index name issue.
2017-05-20 11:54:55 +02:00
Samuel Georges aa393dc54b Backend style improvements
This should make Windows PCs look a little nicer, albeit inconsistent with others (Sergoe UI is unique). If it's good enough for GitHub, then it's good enough for October.
All text shadows have been stripped, along with some box shading. They were barely noticeable and should speed up the UI.
2017-05-20 17:37:58 +10:00
Samuel Georges bab7976331 Merge branch 'develop' into l55upgrade 2017-05-20 09:08:09 +10:00
Szabó Gergő c597563145 Fixed spaces 2017-05-19 11:29:19 +02:00
Samuel Georges 081a32c928 Change versions for testing 2017-05-19 14:13:23 +10:00
Samuel Georges 4d1bec860d thumbnailDirectory -> thumbFolder 2017-05-16 08:47:15 +10:00
Samuel Georges d9cf7381dc Implement helper method for checking ignored path
Refs #2858
2017-05-16 07:38:38 +10:00
Samuel Georges 2a0a91486c Logic error - fixes #2654 2017-05-16 07:24:07 +10:00
Samuel Georges 5ca3c3fa35 Merge pull request #2859 from TimFoerster/patch-2
Allows 0 and ‘0’ values as default values for theme settings
2017-05-15 20:31:59 +10:00
Samuel Georges f05f4c21cf Merge pull request #2858 from TimFoerster/patch-1
Filter layout by ignored file names
2017-05-15 20:29:53 +10:00
Luke Towers a5b081b74b Make the MediaManager messages more generic 2017-05-15 00:16:28 -06:00
Luke Towers 21d4f683c3 Support custom thumbnail directory
This enables support for edge cases that require custom thumbnail directories (such as requiring authentication to view generated thumbnails).
2017-05-14 22:41:31 -06:00
Luke Towers 7a820f3c43 Remove reference to hardcoded media path
Replaces the reference to a hardcoded `/media` path when generating a local temp file path to utilize the folder name as set in `cms.storage.media.folder`.
2017-05-14 22:28:08 -06:00
Luke Towers 0f04afbea4 Recompile mediamanager assets to include the fix 2017-05-14 19:34:50 -06:00
Luke Towers 84ee4f2679 Fix for #2765
Actual changes are in `MediaManager.prototype.deleteConfirmation`, apologies for the trailing whitespace removals, my editor auto does that and I didn't feel like removing it since there shouldn't really be trailing whitespace anyways.

Fixes #2675 (and probably other potential oopsies) by skipping over the "return to parent" item in the deletion handling method. The "return to parent" item contains a reference to the folder above the current folder, which could potentially cause the entire media folder to be deleted; and would certainly remove a lot more than actually intended.
2017-05-14 19:32:57 -06:00