Commit Graph

147 Commits

Author SHA1 Message Date
Toby Zerner
f559c9a651 Merge branch 'master' into visibility-scoping
# Conflicts:
#	bootstrap.php
2018-01-21 08:36:02 +10:30
Toby Zerner
a390f7ca1b Make sure the discussion is_approved attribute value is correct 2018-01-21 08:34:33 +10:30
Toby Zerner
e8103ad0b3 Fix query errors 2018-01-21 08:33:45 +10:30
Franz Liedke
7435d18940 Adapt new bootstrap format, use Asset extender 2018-01-16 23:17:47 +01:00
Miles Cellar
441639c05d Update license year range to 2018 2018-01-15 19:32:06 +01:00
Toby Zerner
c0dd66bef5 Update for visibility scoping API changes in core 2018-01-11 12:19:20 +10:30
Toby Zerner
a822ab8310 Fix class name 2017-12-26 19:47:42 +10:30
Toby Zerner
15039737b8 Don't over-cache the disallowed tags 2017-12-26 19:44:53 +10:30
Toby Zerner
6f07aef206 Performance: Reuse list of disallowed tags 2017-12-26 19:44:53 +10:30
Toby Zerner
910ddc9f55 Apply fixes from StyleCI
[ci skip] [skip ci]
2017-09-14 09:15:48 +09:30
AakLak
2ea6cbee46 run the convert.sh script by CDK2020 to replace namespaces to be comp… (#8)
* run the convert.sh script by CDK2020 to replace namespaces to be compatible for beta8

* update docbloc to match updated namespace
2017-09-14 09:15:11 +09:30
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
Miles Cellar
f021402202 Update year 2017-01-01 22:44:22 +01: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
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
ea2bc24c0b v0.1.0-beta.6 2016-10-19 21:12:14 +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
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
864b696f38 Upgrade to flarum-gulp 0.2.0 / Babel 6 2016-03-18 09:31:17 +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
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
Franz Liedke
272d59c6d4 Use new migration format 2016-02-24 23:11:26 +09:00
Maël Soucaze
a4aef88a36 Update license year range to 2016 2016-01-25 16:49:11 +01:00
Toby Zerner
97cb86dcbe Add Composer branch-alias
This allows installations to require version 0.1.0 with minimum-stability=dev, and they will get the latest from master.

See flarum/core#727
2016-01-19 17:20:19 +10:30
Toby Zerner
83ed64bb3b Commit latest dist files
See https://github.com/flarum/core/issues/727#issuecomment-172384020
2016-01-19 16:52:18 +10:30
Toby Zerner
f096e54edd Rename package 2015-12-29 12:54:24 +10:30
dcsjapan
b6e5dd0726 Extract translations
- Adds app.translator calls for forum and admin interfaces.
- Locale file to follow later.
2015-11-29 12:13:43 +09:00
Toby Zerner
cb6be3fcc5 Translations are now automatically included 2015-11-02 18:51:44 +10:30
Toby Zerner
b91e4e1e63 Update icon, metadata 2015-10-12 14:58:54 +10:30
Toby Zerner
69b84438a3 Update compile script 2015-10-11 23:17:00 +10:30
Toby Zerner
5486cc3ed8 Update for composer branch 2015-10-11 22:54:48 +10:30
Toby Zerner
5d9d04d2ab Add license 2015-09-25 16:15:31 +09:30
Toby Zerner
937b70bdf8 Initial commit 2015-09-22 18:14:56 +09:30