Commit Graph

4144 Commits

Author SHA1 Message Date
Luke Towers 46205298df Add the user's role to the columns 2017-10-15 11:49:06 -06:00
Luke Towers f739e457e4 Enable superusers to actually use the is_superuser filter 2017-10-14 21:55:56 -06:00
Luke Towers fa840d79f6 Improve support for three tier user system
This builds on 4fd1ca824f by switching from a two tier approach to permissions (superusers and regular users), to a three tier approach (superusers (developer), second-in-command (clients with manage_users permissions), and regular users). If support for a four tier approach is necessary (Superuser, Franchise Owner, Franchise Business Manager, Franchise Staff as an example), then it can be implemented simply by adding a flag to roles that would prevent anyone except for a superuser from assigning that role.

The specific changes made by this commit is to support users with the manage_users permission (but who are not superusers) to be able to assign roles to other users and improvements to the sanctity of the superuser itself. Non-superusers can no longer see or edit superusers in the backend (that was previously poorly handled as a non-superuser with manage_users could take over a superuser account since they could modify that account willy-nilly), and the is_superuser filter is accordingly removed as well.
2017-10-14 00:25:52 -06:00
Szabó Gergő 33a699e587 Add new lines (#3169) 2017-10-13 08:58:46 -06:00
Samuel Georges c3a2522a04 Merge pull request #3161 from allenjd3/develop
fix documentation #3160
2017-10-11 12:57:12 +11:00
James Allen a697970b92 fix documentation #3160 2017-10-10 21:24:56 -04:00
Harmen Janssen a2a91a38e6 Added PluginManager::unregisterAll() (#3156) 2017-10-08 12:14:17 -06:00
Wellyson Freitas dcfe59b807 Adding method to return a list of MailTemplate objects (#3152)
* Method to return a list of MailTemplate objects (for `rainlab/translate-plugin` list translatable messages). See: https://github.com/rainlab/translate-plugin/issues/87
2017-10-04 14:06:17 -06:00
datune 8906b86027 Add return statement to listExtendRecords event (#3153)
Fixes #2965
2017-10-04 14:05:05 -06:00
datune 4a0a488ff6 Account for NestedTree Trait setting (#3143)
* Account for NestedTree Trait setting

See https://github.com/rainlab/blog-plugin/issues/338. The Lists Widget did not account for the NestedTree setting.

* Update Lists.php
2017-10-04 14:04:12 -06:00
jimcottrell 263200fd7b Support form field commentHtml flag for section, checkbox, and switch types (#3150) 2017-10-03 13:41:14 -06:00
Floris Koch 161d81a192 Update _repeater_item.htm (#3149)
Allows using language files for group titles.
2017-10-03 10:15:29 -06:00
Massimo Ghinassi 791eb054fc Typo (#3146) 2017-10-03 00:30:27 -06:00
Alexander Guth 93a2898379 Do not change behavior: pass request data back to the options object (#3012)
Current changes to the ``framework.js`` led to a breaking change due to the fact, that ``options.data`` was no longer populated with the request data. The ``options`` object is part of the ``context`` object, which is later beeing passed to ``ajaxBeforeSend``
The two relevant versions of the file show the change of behavior:
b6fedfb688/modules/system/assets/js/framework.js (L56) => https://github.com/octobercms/october/blob/develop/modules/system/assets/js/framework.js#L88
The change is required to remain consistent with the old behavior. This code is tested and appears to be working as it did formerly.
2017-09-19 15:34:48 -06:00
Samuel Georges d30dd19b70 Rollback 510071550a
This issue has been addressed too early in the process lifecycle. The line number should be incremented later, say in the view layer when the error is displayed. A simple helper to determine what the index increment should do well.

$row + $indexIncrement

This is so we don't have to rebuild the array, which is computationally expensive for large datasets and could be frustrating for a developer expecting untouched index values, or likewise needing to prepare our special format.
2017-09-17 10:14:14 +10:00
Luke Towers 510071550a Report correct row number in import error logs
This fixes an issue where the row number reported by import error logs would be off by 1 or 2 depending on whether the first row was labelled as titles or not.

As arrays start at 0 in PHP, `$firstRowTitles = false` would result in reported row numbers being off by one less than their actual number. If `$firstRowTitles = true`, the reported row number would be off by two less than their actual number (one for the zero index, one for the first row not existing in the `$results` set).
2017-09-15 17:05:46 -06:00
Szabó Gergő fa2c536a53 Hungarian translate for Mail branding (#3115)
and minor corrections
2017-09-15 09:41:48 -06:00
Samuel Georges 58aa360eab The text input value should be explicit, not mutated, ever.
Rollback fb893efb9ca3a0fa25e3bb9fd01f55cef6216473
Refs #2942
Refs #3101
2017-09-15 08:41:05 +10:00
Fl0Cri d7b0e55ceb Fixes broken richeditor z-index inside and outside of a popup (#3113)
Fixes #3098, #3111. Credit to @Fl0Cri
2017-09-14 15:17:31 -06:00
Samuel Georges cd76f2e04f Field definition should override magic 2017-09-13 14:29:42 +10:00
Luke Towers 9565565865 Add ignoreTimezone option to datepicker field and column types.
Adds the ability to specify an `ignoreTimezone: true` option on the config for a datepicker form widget or date column type. This will ignore both October's and the backend user's timezone settings to display the date exactly as it is stored.
2017-09-10 22:39:15 -06:00
Fl0Cri 50d6db7d1c Allow raw values in subject header (#3092) 2017-09-07 08:42:27 -06:00
TimFoerster ead70c43f3 changing z-index of richeditor (#3099)
Changed z-index of the richeditor to prevent hidden popups.
Fixes #3098
2017-09-07 08:36:50 -06:00
Samuel Georges 8a1b060a29 Tidy up from #3084 2017-09-06 09:00:53 +10:00
Samuel Georges 233dd539f6 Merge pull request #3084 from jofrysutanto/develop
Allow simple pagination option on ListControllers
2017-09-06 08:52:08 +10:00
Jofry S 2c97c55ea8 Allow simple pagination option on ListControllers 2017-09-05 13:33:51 +10:00
Luke Towers 8a8013e52e Fixes #3081. Resets module dependencies from dev to stable. Refs 081a32c928 2017-09-04 12:40:55 -06:00
Luke Towers 5185ca075b Add the cms.object.listInTheme event (#3076)
Inspired by #3075. Provides a cms.object.listInTheme event to modify the results returned by that method.
2017-09-02 19:51:56 -06:00
Samuel Georges dfdf81e245 Merge pull request #3004 from Samorai/develop
Added translation for pageTitle into MailBrandSettings
2017-09-02 08:26:31 +10:00
Samuel Georges 4074ad8cc9 Laravel 5.5 released 2017-08-31 20:57:00 +10:00
TimFoerster 54b1250fbd Update backend/lang/de/lang.php (#3063) 2017-08-29 10:32:43 -06:00
Tschallacka b152663ff5 Attribute values for < and > and '' should be written als &lt; &gt; and &quot;(when enclosed with double quotes for attribute delimters) (#3043) 2017-08-29 10:29:48 -06:00
Edmond Mensah ac75fa36ec Fix broken linkedIn profile link (#3058) 2017-08-24 20:56:07 -06:00
Szabó Gergő cfd3d54316 Update the Hungarian translation (#3046)
Compatible with October build 420
2017-08-18 08:26:51 -06:00
Tschallacka c97d29fe4f Remove unused reference (#3045) 2017-08-17 14:00:43 -06:00
Samuel Georges deaf56cc81 Merge pull request #3039 from vakopian/popover-filter-bug
Popover filter bug
2017-08-17 12:10:39 +10:00
Vardan Akopian 7a94d41702 add `popup-allow-focus` class for popover template 2017-08-16 16:35:41 -07:00
Vardan Akopian 5ad132b57f add `popup-allow-focus` to the popover templates 2017-08-16 16:35:02 -07:00
Samuel Georges fec397d365 Merge pull request #3037 from petehalverson/develop
Edge support for `october:util set build`
2017-08-16 09:12:07 +10:00
Peter Halverson dc50b34c7b Edge support for `october:util set build` 2017-08-15 17:02:57 -06:00
Luke Towers cf6ca02886 Support no database existing when october:util set build is run
This fixes an issue when composer automatically calls the `php artisan october:util set build` command after installing dependencies but before a database has been initialized for October.
2017-08-13 15:53:19 -06:00
Luke Towers 7c3d4705fc Support firstDay in date & date range filters
Ref: 962aa32a60 (commitcomment-23597564)
2017-08-11 08:59:06 -06:00
Samuel Georges 928a123791 Merge pull request #3027 from Teranode/patch-1
Laravel 5.5 Engine directory change
2017-08-09 13:00:12 +10:00
Christian 98bc0c0977 Laravel 5.5 Engine directory change
They moved the Engine interface to Contracts so this is a small fix.
2017-08-08 21:55:48 -04:00
Matheus Naldi f8ceeb7b52 Improved deferred bindings query performance (#3014)
Credit to @MatheusNaldi. Fixes #2877
2017-08-07 11:54:33 -06:00
Sang Min Oh 969eaccf8b korean language support for backend (#3023)
Credit to @everydayparty
2017-08-06 12:36:34 -06:00
Luke Towers 9745b3ba75 Compiled assets 2017-08-05 18:11:40 -06:00
Luke Towers a705a70f35 Cleanup for #2856
Removed `minNumber` and `maxNumber` options, they are not enforceable on the client side without a lot more work. Added `number` filter type, added missing numberrange filter template, consolidated styles for filter-date and filter-number filters.
2017-08-05 18:10:36 -06:00
Luke Towers be87fbbb87 added feature to allow filtering over a number range (#2856)
Original by @purposebuiltscott in #2856
2017-08-05 14:01:59 -06:00
Luke Towers 92d88fc4dc Merge pull request #3021 from octobercms/Luke
Improve support for scope properties
2017-08-05 12:51:05 -06:00