1
0
mirror of https://github.com/flarum/core.git synced 2025-08-05 16:07:34 +02:00
Commit Graph

431 Commits

Author SHA1 Message Date
Franz Liedke
34bfa56fce Merge branch 'master' of github.com:flarum/flarum-ext-approval 2017-07-27 00:21:09 +02:00
Toby Zerner
e5bdcce36d Add default permissions 2017-07-22 12:22:03 +09:30
Franz Liedke
fe7a901e83 Merge pull request #6 from janga1997/patch-1
Hide diff for compiled diff files
2017-02-20 16:18:33 +01:00
VSN Reddy Janga
7d924fb829 Hide diff for compiled diff files 2017-02-20 19:37:23 +05:30
Franz Liedke
5839d6201d Merge pull request #6 from milescellar/patch-1
Update year
2017-01-02 20:05:50 +01:00
Franz Liedke
cbe3e16c86 Merge pull request #5 from milescellar/patch-1
Update year
2017-01-02 20:04:41 +01:00
Miles Cellar
b3804c1ef5 Update year 2017-01-01 22:45:02 +01:00
Miles Cellar
f021402202 Update year 2017-01-01 22:44:22 +01:00
Toby Zerner
e420a539c7 Merge pull request #4 from flarum/analysis-qxB400
Apply fixes from StyleCI
2016-11-29 16:02:37 +10:30
Toby Zerner
0ce8aac6ca Merge pull request #5 from flarum/analysis-qBw0MA
Apply fixes from StyleCI
2016-11-29 16:02:35 +10:30
Toby Zerner
9a3b9ba824 Apply fixes from StyleCI
[ci skip] [skip ci]
2016-11-29 05:29:35 +00:00
Toby Zerner
47bf958448 Apply fixes from StyleCI
[ci skip] [skip ci]
2016-11-29 05:29:35 +00:00
Franz Liedke
efdff2df68 Extract another variable 2016-11-19 16:57:11 +01:00
Franz Liedke
0741610989 Merge pull request #4 from liji/fix-discussion-not-updated-after-approval
fix:discussion was not updated correctly after post approval
2016-11-19 16:55:47 +01:00
Toby Zerner
45b20dff95 Recompile JS 2016-11-19 21:46:54 +10:30
liji
29a5240f64 fix:discussion was not updated correctly after approval 2016-11-17 17:19:26 +08:00
Toby Zerner
f64369e61a Update StyleCI rules 2016-11-16 15:46:00 +10:30
Toby Zerner
cd89913964 Update StyleCI rules 2016-11-16 15:45:59 +10:30
Toby Zerner
ea2bc24c0b v0.1.0-beta.6 2016-10-19 21:12:14 +10:30
Toby Zerner
fd0d8bca93 v0.1.0-beta.6 2016-10-19 21:12:05 +10:30
Toby Zerner
78bb373a22 Make discussion isApproved attribute available when fetching notifications. fixes flarum/core#976 2016-08-27 22:51:09 +09:30
Franz Liedke
64c8b1ad98 Make StyleCI happy 2016-06-13 21:05:19 +09:00
Toby Zerner
72bff02d68 Recompile dist JS using latest version of babel 2016-06-03 10:58:39 +09:30
Toby Zerner
f902c949c4 Use new event name 2016-06-03 10:58:24 +09:30
Toby Zerner
bb2b5b0ad4 Recompile dist JS using latest version of babel 2016-06-03 10:58:11 +09:30
Toby Zerner
9c6466338c Unapprove discussions too 2016-06-03 10:58:05 +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
cbab23a3f5 Fix bug in permission logic 2016-05-27 14:46:11 +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
0ab8bb95cc Require core v0.1.0-beta.5 2016-03-29 18:42:01 +10:30
Toby Zerner
5b79abeea1 Require core v0.1.0-beta.5 2016-03-29 18:40:26 +10:30
Toby Zerner
864b696f38 Upgrade to flarum-gulp 0.2.0 / Babel 6 2016-03-18 09:31:17 +10:30
Toby Zerner
8f0393fd24 Upgrade to flarum-gulp 0.2.0 / Babel 6 2016-03-18 09:31:06 +10:30
Toby Zerner
c010ecb548 Clean up linting stuff 2016-03-10 17:23:43 +10:30
Toby Zerner
dba0512163 Clean up linting stuff 2016-03-10 17:23:34 +10:30
Franz Liedke
69ab036bb8 Use new shortcuts for migrations 2016-03-04 01:10:42 +09:00
Franz Liedke
bba105748b Use new shortcuts for migrations 2016-03-04 01:10:25 +09:00
Toby Zerner
f26b1a56da Merge pull request #3 from flarum/analysis-8bQjba
Applied fixes from StyleCI
2016-02-26 14:24:05 +10:30
Toby Zerner
a70e9621aa Applied fixes from StyleCI 2016-02-25 22:51:02 -05:00
Toby Zerner
601169e6e9 Add StyleCI config 2016-02-26 14:01:11 +10:30
Toby Zerner
32519c47de Merge pull request #3 from flarum/analysis-zGDx6r
Applied fixes from StyleCI
2016-02-26 13:49:24 +10:30
Toby Zerner
32625c258f Applied fixes from StyleCI 2016-02-25 22:19:12 -05:00
Toby Zerner
29d443eabc Add StyleCI config 2016-02-26 13:47:54 +10:30
Franz Liedke
272d59c6d4 Use new migration format 2016-02-24 23:11:26 +09:00
Franz Liedke
3188e2119e Use new migration format 2016-02-24 23:11:07 +09:00
Toby Zerner
b782e0e2fd Merge pull request #2 from maelsoucaze/patch-1
Update license year range to 2016
2016-01-26 11:15:09 +10:30