1
0
mirror of https://github.com/flarum/core.git synced 2025-08-27 01:55:04 +02:00
Commit Graph

8867 Commits

Author SHA1 Message Date
Toby Zerner
c3f0f3b14c Fix up some references to old classes 2016-05-29 16:01:58 +09:30
Toby Zerner
2a75581b13 Use smaller FontAwesome shim repo instead of original
components/font-awesome is ~8 MB smaller than fortawesome/font-awesome because it excludes all examples/docs. Reducing dependency filesize will be important when we want to package up a .zip for distribution.
2016-05-29 10:21:37 +09:30
Toby Zerner
7d5bc472f8 Revert "Simplify discussion/tag permission logic"
This reverts commit 01e776e2be.

Turns out that there was a good reason for the original logic... the case of per-tag moderators.
2016-05-28 20:49:43 +09:30
Franz Liedke
16f3a09856 Deduplicate emojis even after using multiple matchers
Fixes flarum/core#968.
2016-05-28 16:22:31 +09:00
Toby Zerner
9661e05c83 Update permission icon for consistency 2016-05-28 10:03:27 +09:30
Toby Zerner
1629e7fbb4 Add separate tag permission for being able to add that tag to discussions
By default this is just the same as the "startDiscussion" permission, but flarum-ext-approval comes in and denies "addToDiscussion" specifically for tags where the user can't start discussions without approval.

ref flarum/core#904
2016-05-28 10:03:00 +09:30
Toby Zerner
01e776e2be Simplify discussion/tag permission logic
A user now must have a permission to act for *all* tags assigned to a discussion, rather than just one of them. This is consistent with the way the permissions are worked out for visibility.
2016-05-28 10:00:41 +09:30
Toby Zerner
e3278070ac Rename DiscussionWasTagged user property for consistency 2016-05-28 09:55:45 +09:30
Toby Zerner
63a4b34d6e Serialise tag IDs to integers rather than strings 2016-05-28 09:54:39 +09:30
Toby Zerner
823233b0da Generalise the potential for display of flags to all posts, rather than just comments
This is just more future-proofing, in case any other extensions introduce new post types which can be flagged.
2016-05-28 09:53:42 +09:30
Toby Zerner
d0c54cdbf9 Only allow OP to add tags that they can start discussions without approval in
closes flarum/core#904
2016-05-28 09:52:47 +09:30
Toby Zerner
badd03f3a3 Give the hidden/trash badge precedence over the awaiting approval badge
Given flarum/core@2d5a7ce, the hidden badge will no longer display for discussions awaiting approval – it will only display if the discussion has *actually* been marked as deleted by the OP. Thus, this information should have precedence. (There isn't much point in displaying both badges, I don't think.)
2016-05-28 09:50:45 +09:30
Toby Zerner
0bd3c16084 Generalise the potential for unapproved state to all posts, rather than just comments
This is just more future-proofing, in case any other extensions introduce new post types which can be queued for approval.
2016-05-28 09:48:17 +09:30
Toby Zerner
9f4e11097d Add actor information to the PostWasApproved event 2016-05-28 09:46:22 +09:30
Toby Zerner
ff6e674854 Give the is_approved attribute a default value on new Post models 2016-05-28 09:46:03 +09:30
Toby Zerner
5bc55e4538 Make Post component subclasses build on parent content
Extensions may wish to add attributes/content to all posts, regardless of type, by extending methods on the Post component. Now the subclasses will not overwrite, but rather append to, these additions.
2016-05-28 09:44:44 +09:30
Toby Zerner
971a1a5cdd Make discussion "hidden" state more explicit
Previously a discussion was classified on the front-end as "hidden" if it had zero posts. This was technically a correct statement as the discussion would not be visible to the public... but it also meant that a discussion with zero posts (like one awaiting approval) was impossible for the OP to delete/hide (i.e. indicate that they made a mistake and they don't want the discussion to be approved).
2016-05-28 09:43:21 +09:30
Toby Zerner
ed2257efb0 Remove space characters from in-between list items
They were causing some weirdness with spacing between redraws.
2016-05-28 09:38:58 +09:30
Toby Zerner
97b6b06280 Allow extensions to add default model attributes
Extensions can add default column values in their migrations, but Eloquent doesn't know about this when it first saves a model to the database.

This is useful in flarum-ext-approval where the default value for is_approved on the posts table is true.
2016-05-28 09:37:43 +09:30
Toby Zerner
fb939da898 Fix permission logic priorities
This helps to fix a bug in flarum-ext-tags where a user could not rename or edit the tags of their own discussion if it was in a restricted tag. This was due to the order of GetPermission event listeners – the logic that determines that a user *can't* perform an action because of a restrictive tag was running before (and thus instead of) the logic that determines that a user *can* edit their own stuff.

The solution is to change the "catch-all" methods on Policies to "after" instead of "before" – that is, they will run only if the per-ability methods return null.

We also simplify the GetPermission event by passing the model as a sole "argument", as I can't imagine any cases where we'll need more than one argument.
2016-05-28 09:35:08 +09:30
Toby Zerner
8ab991c299 Make sure deprecated ConfigureClientView event still works 2016-05-27 14:57:27 +09:30
Toby Zerner
e6b16234b6 Fix installer/updater 2016-05-27 14:53:22 +09:30
Toby Zerner
cbab23a3f5 Fix bug in permission logic 2016-05-27 14:46:11 +09:30
Toby Zerner
a4a3185233 Add new translations for flarum-ext-approval 2016-05-27 14:42:31 +09:30
Toby Zerner
822e823936 Compatibility with new "required permissions" concept 2016-05-27 14:41:48 +09:30
Toby Zerner
4282b9be20 Add separate "start discussions without approval" permission
- Register required permissions so that "start discussions without approval" can only be set for groups that already have permission to "start discussions" (and same for reply)
- Change the "hidden" trash badge into a more descriptive gavel badge for discussions that are awaiting approval

closes flarum/core#904
2016-05-27 14:40:59 +09:30
Toby Zerner
059950ef4a Simplify deleted post toggle CSS
(The animation was buggy anyway)
2016-05-27 13:56:56 +09:30
Toby Zerner
cc36542b40 Only check for reply permission for actual replies. fixes #917 2016-05-27 13:56:04 +09:30
Toby Zerner
d4a333e2b8 Fix notifications dropdown not showing 2016-05-27 13:53:50 +09:30
Toby Zerner
8d26d2ee8f Improve permissions page
- Introduce the concept of "required permissions" - basically a permission dependency tree. In order for a group to be granted one permission, they must also have another.
- Improve redraw performance by not building dropdown menu contents until dropdown is opened

ref #904
2016-05-27 12:42:19 +09:30
Toby Zerner
3bfd5ee35d Give PostEdited default cursor; make info slightly more compact 2016-05-27 12:39:15 +09:30
Toby Zerner
4c3ebe2538 Fix PostEdited tooltip not updating 2016-05-27 12:38:28 +09:30
Toby Zerner
dc21bbb743 Fix detection of whether or not an asset file is "empty"
We can't rely on files/strings for this, since the Locale JsCompiler doesn't use either, but still has content.
2016-05-27 12:20:14 +09:30
Franz Liedke
558f2103ef Make StyleCI happy and fix some docblocks 2016-05-27 09:07:49 +09:00
Davis
e41a427a6b Trim spaces in getPlainContent, prevent images from loading
fixes #834 closes #963
2016-05-27 07:34:57 +09:30
Toby Zerner
500cdbbcb3 Recompile dist JS 2016-05-27 07:32:36 +09:30
Davis
6061f404f9 Fix Permission Name (#965) 2016-05-26 23:54:25 +09:00
Toby Zerner
fd59f0ee48 Prevent mentions summary from blocking post controls 2016-05-26 22:26:05 +09:30
Toby Zerner
7d448e81ff Bring post controls dropdown in front of the composer again
The underlying problem is fixed in flarum-ext-mentions.
2016-05-26 22:25:39 +09:30
Toby Zerner
fbe87416cf Don't write/serve empty asset files
The new locale-specific CSS file doesn't have any content by default, so it's a waste to write it and serve it to the user.
2016-05-26 22:24:56 +09:30
Toby Zerner
ed8a145348 Rename Server register API to extend
More consistent with how extensions work
2016-05-26 19:12:32 +09:30
Toby Zerner
c809f329bb Update settings reference 2016-05-26 19:05:28 +09:30
Toby Zerner
d2bce5d756 Refactor the web app bootstrapping code
- All custom JS variables are now preloaded into the `app.data` object, rather than directly on the `app` object. This means that admin settings are available in `app.data.settings` rather than `app.settings`, etc.
- Cleaner route handler generation
- Renamed ConfigureClientView to ConfigureWebApp, though the former still exists and is deprecated
- Partial fix for #881 (strips ?nojs=1 from URL if possible, so that refreshing will attempt to load JS version again)
2016-05-26 19:04:24 +09:30
Maël Soucaze
bf31979a59 Remove unnecessary double quotes (#77) 2016-05-23 22:59:16 +09:00
Maël Soucaze
dfd614e6ea Add language line for image dimensions validation rule (#78)
See: da64a014e7
2016-05-23 22:59:04 +09:00
Franz Liedke
e07b5eb8eb Recompile dist JS 2016-05-23 22:54:48 +09:00
Dominion
afeee3af4b Pluralize Turkish (#967)
- Changes the pluralization category of Turkish.
- See: https://discuss.flarum.org/d/2937-pluralization-problems
2016-05-23 22:53:33 +09:00
Franz Liedke
a7f20e67ea Update TextFormatter to next release
This fixes some minor issues with emojis working correctly in the dropdown,
but not when rendered in the live preview or from the server.
2016-05-23 22:48:59 +09:00
Toby Zerner
310fed2329 Tweak quote button positioning/style
Now appears where your cursor ends the selection, but not overlapping text.
2016-05-22 14:05:38 +09:30
Toby Zerner
93c4cd8960 Merge pull request #76 from dcsjapan/misc-cleanup
Clean up translation keys
2016-05-21 22:05:51 +09:30