Commit Graph

294 Commits

Author SHA1 Message Date
Toby Zerner
26483cc0c5 Realign tags in discussion list 2018-02-06 17:24:09 +10:30
Daniël Klabbers
71850db995 Merge pull request #46 from michaeldalyuk/master
Fix issue #1249 and do not show or count private discussions in Tags …
2018-02-02 07:03:07 +01:00
Michael Daly
f7b5b7d21d Fix issue #1249 and do not show or count private discussions in Tags summary. 2018-02-01 23:06:41 +00:00
Toby Zerner
8060bb78ac Merge branch 'master' into visibility-scoping 2018-01-27 09:26:14 +10:30
Franz Liedke
b1ed9d4d1d Extender: List all assets explicitly 2018-01-21 21:11:06 +01:00
Franz Liedke
ad07d7570f Fix order of imports 2018-01-17 08:27:57 +01:00
Franz Liedke
dd9907a26b Adapt new bootstrap format, use Asset extender 2018-01-16 23:20:25 +01:00
Toby Zerner
5931decedf Merge pull request #45 from milescellar/patch-1
Update license year range to 2018
2018-01-16 15:30:18 +10:30
Miles Cellar
251d986bfb Update license year range to 2018 2018-01-15 19:38:25 +01:00
Toby Zerner
2e6eda3ed1 Update policy method name
See flarum/core@ae2e07e94c
2018-01-11 14:11:57 +10:30
Toby Zerner
77d33c8604 Update for visibility scoping API changes in core 2018-01-11 12:35:59 +10:30
Toby Zerner
60845eeee7 Use *Raw methods instead of Expression 2018-01-11 12:32:09 +10:30
Toby Zerner
608e42e616 Require beta 8 2018-01-11 12:29:53 +10:30
Toby Zerner
3934f12b48 Fix docblock 2017-12-27 16:07:25 +10:30
Toby Zerner
d96cff6332 Fix class names 2017-12-27 16:07:21 +10:30
Toby Zerner
b4bc534028 Upgrade to Laravel 5.5 2017-12-27 07:32:21 +10:30
Toby Zerner
8b843a9eb3 Fix class names 2017-12-27 07:31:26 +10:30
Toby Zerner
ccd1aff156 Merge branch 'master' into next-back 2017-12-27 07:09:40 +10:30
Toby Zerner
89f417097b Performance: Load only basic information about lastDiscussion 2017-11-11 22:40:48 +10:30
Toby Zerner
6a21d292c5 Performance: Eager load parent tags 2017-11-11 22:40:22 +10:30
Toby Zerner
e3e7da3f52 Add class to IndexPage when viewing a tag 2017-10-25 20:23:06 +10:30
Franz Liedke
0b5a9d59ba Fix class names 2017-10-03 19:44:53 +02:00
Charlie
360b9b04f1 Update for beta 8 (#44)
* Update for beta 8

* Make StyleCI happy

* Update Tag.php
2017-09-01 16:37:39 +09:30
Franz Liedke
e85f4122ee Remove obsolete import 2017-07-27 00:27:48 +02:00
Toby Zerner
ae86c1113d Require b7 for new migration helper 2017-07-22 12:15:22 +09:30
Toby Zerner
c1789f65be Add default permissions 2017-07-22 12:14:27 +09:30
Toby Zerner
367423d0af Tweak permission logic
Restricted tag permissions trump global permissions. If any tag is
restricted and the user has permission, then grant the permission,
regardless of global permissions.
2017-07-20 11:51:22 +09:30
Toby Zerner
aa62a88718 Change tag permission logic
Require a user to have permission for *all* of the restricted tags a
discussion has, rather than just one.

See https://github.com/flarum/flarum-ext-approval/pull/7#issuecomment-316561532
2017-07-20 11:21:19 +09:30
Toby Zerner
05fab134e9 Fix permissions not applying
The AbstractPolicy's `before` method was changed to `after` a while ago,
and this instance must've slipped through the cracks.
2017-07-20 09:48:49 +09:30
David Sevilla Martín
3c0efb3373 Show modal if # of primary/secondary tags is less than required (#41) 2017-07-15 08:28:08 +02:00
Toby Zerner
fb17769074 Actually no npm lockfile, at least for now
Since I tend to do `npm link gulp flarum-gulp` so I'm not sure if the lockfile is valid?
2017-07-08 21:48:36 +09:30
Toby Zerner
162eef01dd Update dependencies 2017-07-08 21:36:49 +09:30
Toby Zerner
99c62ccdb0 Fix validation of "hidden" checkbox not working 2017-07-08 21:36:30 +09:30
Toby Zerner
49504da31e Merge pull request #40 from dshoreman/eagerload
Lazy-load any included relationships on /api/tags
2017-04-12 06:38:29 +09:30
Dave Shoreman
c2fe1fdce5 Lazy-load any included relationships on /api/tags 2017-04-11 14:01:17 +01:00
Dave Shoreman
f61d834a76 Enable parent to be set during creation via API (#39)
* Enable parent to be set during creation via API

Sets the parent ID as long as it exists and is a top-level primary tag.
If it's not, it'll simply be ignored. Position is set automatically to
be one higher than the current highest, or 0 if parent has no children.

Example data (in addition to the usual attributes):
```
"relationships": {
    "parent": {
        "data": {
            "id": 1
        }
    }
}
```

* Add support for creating top-level tags

To set a top-level primary tag, pass parent id of 0
For a secondary tag, pass null or remove it from the request
To set as a child, pass the parent tag's id
2017-04-11 13:54:35 +09:30
Toby Zerner
61321c32ed Merge pull request #38 from dshoreman/include-fix
Specify available includes for /api/tags endpoint
2017-04-11 10:38:59 +09:30
Dave Shoreman
941a0b2c8a Specify available includes for /api/tags endpoint 2017-04-10 23:23:32 +01:00
Toby Zerner
dfe094981b Merge pull request #36 from dshoreman/fix-api-error
Fix Internal Server Error for blank API requests
2017-04-07 18:05:28 +09:30
Dave Shoreman
fb8ad8fe9a Fix Internal Server Error for blank API requests
Attempting to send an empty body to the create and update endpoints will
result in Flarum outputting "Internal Server Error" as plain text,
instead of failing gracefully with a json-ised validation exception.

This commit adds an empty array as the third parameter to array_get,
which sets the default value and thus allows Flarum to do its thing.
2017-04-06 04:16:40 +01:00
Franz Liedke
be643a1e4b Merge pull request #35 from janga1997/patch-1
Hide diff for compiled diff files
2017-02-20 16:18:48 +01:00
VSN Reddy Janga
dba8ab3244 Hide diff for compiled diff files 2017-02-20 19:27:07 +05:30
Franz Liedke
4fda3ea7d9 Merge pull request #34 from milescellar/patch-1
Update year
2017-01-02 20:03:58 +01:00
Miles Cellar
1464859bfd Update year 2017-01-01 22:42:58 +01:00
Toby Zerner
ec118b93b4 Merge pull request #31 from flarum/analysis-8jJ1xB
Apply fixes from StyleCI
2016-11-29 15:58:28 +10:30
Toby Zerner
c7abaca6bc Apply fixes from StyleCI
[ci skip] [skip ci]
2016-11-29 05:28:17 +00:00
Toby Zerner
deee3c02da Add TagWillBeSaved event 2016-11-28 11:48:28 +10:30
Toby Zerner
4773b3005d Add tag-user state 2016-11-28 11:48:19 +10:30
Toby Zerner
6a363ef4f1 Extract edit tag submit data for extensibility 2016-11-19 22:12:53 +10:30
Toby Zerner
6f9c6ea3dc Recompile JS 2016-11-19 22:12:03 +10:30