github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-29 21:11:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
397 Commits 85 Branches 50 Tags 181 MiB
ed7622ee2d
Commit Graph

376 Commits

Author SHA1 Message Date
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
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
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
Dave Shoreman
941a0b2c8a Specify available includes for /api/tags endpoint 2017-04-10 23:23:32 +01:00
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
VSN Reddy Janga
dba8ab3244 Hide diff for compiled diff files 2017-02-20 19:27:07 +05:30
Miles Cellar
1464859bfd Update year 2017-01-01 22:42:58 +01:00
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
Toby Zerner
5b2966cbc4 Update StyleCI rules 2016-11-16 15:46:28 +10:30
Toby Zerner
11b380c893 Fix permission logic regressions 
Make sure permissions that lie "dormant" in the database don't interfere with the global permissions; actually check each tag's permissions rather than using `hasPermissionLike`.

closes flarum/core#1058
closes flarum/core#1062
 2016-11-07 22:22:19 +10:30
Toby Zerner
eb279b112a v0.1.0-beta.6 2016-10-19 21:11:56 +10:30
Toby Zerner
d68c8e6adb Fix typo 2016-08-03 13:11:23 +09:30
Stephen M. Coakley
bf490d19a2 Add posts API filter for tags 
Add the means of filtering post queries by the tags of the posts' parent discussions. See https://github.com/flarum/core/issues/990.
 2016-08-01 14:10:06 -05:00
Franz Liedke
e4a4bad601 Make StyleCI happy 2016-06-13 21:06:39 +09:00
Toby Zerner
2c4ccc89f9 Use validator for attribute translations 
closes flarum/core#973
 2016-06-05 09:28:13 +09:30
Toby Zerner
5189744038 Use Illuminate to validate tag counts and thus make errors translatable. closes flarum/core#973 2016-06-04 18:46:24 +09:30
Toby Zerner
020d850a3a Disassociate child tag when parent is deleted. fixes flarum/core#962 2016-06-04 16:25:57 +09:30
Toby Zerner
1dc495dfdd Use new event name 2016-06-03 11:03:17 +09:30
Toby Zerner
947587272a Recompile dist JS using latest version of babel 2016-06-03 11:03:11 +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
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
822e823936 Compatibility with new "required permissions" concept 2016-05-27 14:41:48 +09:30
Toby Zerner
c809f329bb Update settings reference 2016-05-26 19:05:28 +09:30
Franz Liedke
84974d3f31 Use newly extracted KeyboardNavigatable util for emoji dropdown 
Refs flarum/core#264.
 2016-05-15 23:18:29 +09:00
Franz Liedke
7190cd84b4 Use the variables that are already instantiated 2016-05-15 20:58:29 +09:00
Franz Liedke
14eb7c97d0 Only list tags available to current user 2016-04-15 21:01:23 +09:00
Niels Tholenaar
1b23e44b06 Added REST tags endpoint (https://github.com/flarum/core/issues/600) 2016-04-15 09:44:53 +02:00
Toby Zerner
36c4c5d966 Require core v0.1.0-beta.5 2016-03-29 18:50:22 +10:30
Toby Zerner
534a96fb72 Fix checkbox/name/description alignment in tag discussion modal 2016-03-28 11:48:01 +10:30
Franz Liedke
a6ecba220a Do not use model classes in the migrations 
See 28f43f805c
 2016-03-20 22:48:18 +09:00
Toby Zerner
eb975802ea Remove unmaintained changelog 2016-03-18 09:34:22 +10:30
Toby Zerner
19bf6667f0 Upgrade to flarum-gulp 0.2.0 / Babel 6 2016-03-18 09:34:13 +10:30
Toby Zerner
94cfc5e535 Extend Page component to take advantage of performance boost in flarum/core@d1c436c 2016-03-11 13:21:53 +10:30
Toby Zerner
5ff97f53ff Clean up linting stuff 2016-03-10 17:21:02 +10:30
Franz Liedke
fdcf1f12ad Use new shortcut for default settings migration 2016-03-08 00:04:42 +09:00
Toby Zerner
d5f3987cf7 Fix warning when deleting discussion forever 
Related to flarum/core#842
 2016-03-03 12:53:31 +10:30
Toby Zerner
287bdf10dd Allow child tags in tile to wrap. fixes flarum/core#613 2016-03-01 16:46:14 +10:30
Franz Liedke
d240d4c0ff Use new shortcuts for migrations 2016-02-29 23:43:24 +09:00
Toby Zerner
ec0054cace Prevent tags from overlapping discussion titles 
This gives the tag labels a max-width in the discussion list, and overflows them with a gradient to transparency. (Unfortunately this only works in WebKit for now.) When hovering over them, they slide out to show more.

Fixes flarum/core#702
 2016-02-29 19:00:38 +10:30
Toby Zerner
c6f0fc0985 Update MergeableInterface method arguments 2016-02-29 18:50:54 +10:30
Toby Zerner
577e51f7ad Only grant a permission for a sub-tag if that permission is granted for its parent too 
Previously if a parent tag was restricted but none of its sub-tags were, the sub-tags would be visible and the parent tag would be loaded in the tag list as a result. This adds permission logic so that sub-tags automatically assume the permissions of their parent as a minimum.

Fixes flarum/core#833
 2016-02-27 18:06:59 +10:30
Toby Zerner
746ecac10a Applied fixes from StyleCI 2016-02-25 22:58:13 -05:00
Toby Zerner
5039e30d99 Add StyleCI config 2016-02-26 14:03:08 +10:30
Toby Zerner
f494b8369d Fix color validation regex. closes flarum/core#827 2016-02-26 10:41:19 +10:30
Franz Liedke
ceda88d701 Add another missing copyright header 2016-02-24 23:31:04 +09:00
Franz Liedke
dd92088b5c Use new migration format 2016-02-24 23:14:20 +09:00
Toby Zerner
fb67393f81 Use correct validation rules for description. closes flarum/core#793 2016-02-11 08:59:30 +10:30
Toby Zerner
873b9fd780 Fix Tags page "start a discussion" button having a fixed width in Firefox 
Fixes flarum/core#349
 2016-02-07 12:10:58 +10:30
jwdeitch
91eb39d615 Update TagValidator.php 2016-01-25 07:58:22 -05:00
jwdeitch
245270e629 Added validation for tags 
https://github.com/flarum/core/issues/758
 2016-01-24 23:06:57 -05:00
Toby Zerner
155b268319 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:17:46 +10:30
Toby Zerner
84f869abf2 Commit latest dist files 
See https://github.com/flarum/core/issues/727#issuecomment-172384020
 2016-01-19 16:53:31 +10:30
Toby Zerner
d1ce9b1fd0 Grant global discussion permissions so that unrestricted tag permissions work 
Say you have limited viewing/starting discussions globally to admins, and then have a single tag which allows everyone to view/start discussions. Previously this wouldn't work as expected because the non-admin would be stopped because when the core command checks for the global permission.
 2016-01-16 14:06:00 +10:30
Toby Zerner
46c1dbfb2a Sort child tags in tiles 2016-01-06 09:04:04 +10:30
Toby Zerner
169222aa04 Add class when TagHero is colored 2016-01-04 16:57:07 +10:30
Maël Soucaze
f209b25f2c Update year range in LICENSE 
Because some changes have been done on that year.
 2016-01-02 07:11:25 +01:00
Toby Zerner
290b426bf2 Only allow starting a discussion on a non-restricted tag if the user has the global permission 2016-01-02 14:57:01 +10:30
Toby Zerner
ec5c639bb6 Scroll overflowing tag tile contents 
This is just a stopgap fix for flarum/core#653; I would like to revise the tag page layout at some point.
 2016-01-02 14:55:48 +10:30
Toby Zerner
6c3cb3f558 Rename package 2015-12-29 12:56:02 +10:30
Franz Liedke
38cf04522e Clean up code 2015-12-11 21:16:38 +01:00
ntaso
1680b1bfe9 Includes primary tag when starting a discussion under secondary tag. Fixes #424. 2015-12-11 17:55:02 +01:00
Toby Zerner
1e6ab2c89d Merge pull request #23 from dbohn/master 
Fixing Issue flarum/core#330
 2015-11-30 09:12:28 +10:30
David Bohn
5c52f3fae0 Added Change Tags Item to PermissionGrid 
Fixed missing bower install and added TODO for translation

Added check to allow edit of tags for author in backend

Fixed code style, added translation key

Extracted tag permissions into method and restored original extension.js

Adressing chaining of policy issue
 2015-11-29 23:19:18 +01:00
Toby Zerner
f3a4174780 Truncate long tag names in tag selection modal 2015-11-25 15:45:51 +10:30
Toby Zerner
f199170054 Fix last commit 2015-11-21 15:14:53 +10:30
Toby Zerner
19e40f76fe Properly overflow tag selection input 2015-11-21 15:11:27 +10:30
Toby Zerner
fdd837ae7e Use correct setting keys 2015-11-20 12:38:20 +10:30
Toby Zerner
56460a057f Fix diff link 2015-11-05 16:40:39 +10:30
Toby Zerner
8d6a44ff95 Release v0.1.0-beta.4 2015-11-05 16:36:16 +10:30
Toby Zerner
3cc5be1270 Add back button icon 2015-11-03 15:59:47 +10:30
Toby Zerner
4d558c0b29 Release 0.1.0-beta.3 2015-11-03 10:04:05 +10:30
Toby Zerner
478bfe4b40 Translations are now automatically included 2015-11-02 18:53:14 +10:30
Toby Zerner
d2c96287d4 Update ItemList API 2015-11-01 09:38:54 +10:30
Toby Zerner
42d87d2b48 Add lib translations 2015-10-31 18:20:11 +10:30
Toby Zerner
2c94819144 Reduce length of slug field to prevent error when creating unique index 2015-10-31 18:19:45 +10:30
Toby Zerner
c371fe764b Update API relationship serializer/listener 2015-10-30 11:07:20 +10:30
Toby Zerner
9e725ca48a Recompile JS 2015-10-27 12:40:35 +10:30
Toby Zerner
6dbdd7d657 Recompile JS 2015-10-27 12:17:44 +10:30
Toby Zerner
2b49987ff3 i18n: Use new translation strings 
closes flarum/core#527
 2015-10-24 12:27:53 +10:30
dcsjapan
2dccb299a0 Reorganize key names 
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Extracts previously unextracted strings.
- Code fix needed in DiscussionTaggedPost.js before this can be used.
 2015-10-23 10:01:44 +09:00
Toby Zerner
117fc7d46b Change app.trans calls to app.translator.trans calls 2015-10-21 10:30:09 +10:30
Toby Zerner
bf04dba33e Enforce unique slugs 
closes flarum/core#393
 2015-10-19 16:50:19 +10:30
Toby Zerner
244b8fd132 Add Interface suffix to SettingsRepository 2015-10-19 14:59:26 +10:30
Toby Zerner
37fac5a0d4 Update translation IDs 2015-10-16 12:42:40 +10:30
Toby Zerner
76eaf8cb2d Refactor tag sorting algorithm 
closes flarum/core#325
 2015-10-14 17:04:17 +10:30
Toby Zerner
eb49e1d4e8 Update references to forum. permissions 
ref flarum/core#425
 2015-10-14 16:12:10 +10:30
Toby Zerner
67c1d79c5c Initialise component state in init() instead of constructor 2015-10-13 16:59:23 +10:30
Toby Zerner
1d5a118951 Update metadata, fix admin settings link 2015-10-12 15:02:11 +10:30
Toby Zerner
5bae959353 Update API, add default translations 2015-10-11 22:23:06 +10:30
Toby Zerner
afc383d443 Fix typos in description 2015-10-11 17:42:41 +10:30
Toby Zerner
d9fde337e3 Rename initializer 2015-10-11 13:01:33 +10:30
Toby Zerner
4a85063702 Move gitignore rules 2015-10-11 11:44:59 +10:30
Toby Zerner
2b85b1bf12 Add more info to composer.json 2015-10-11 11:18:05 +10:30
Toby Zerner
ccc1b02991 Fix migration namespace 2015-10-11 10:04:40 +10:30
Toby Zerner
a351c2ef3c Update APIs, clean up 2015-10-08 23:02:41 +10:30
Toby Zerner
ce0f77d858 Don't require composer installers 2015-10-08 16:54:33 +10:30
Toby Zerner
55c53677e5 Remove unnecessary information from composer.json 2015-10-03 17:36:08 +09:30
Toby Zerner
4b923722be Add vendor prefix to admin JS too 2015-10-03 17:35:55 +09:30
Toby Zerner
d6b829414c Merge branch 'composer' 2015-10-03 17:11:17 +09:30
Toby Zerner
0f57f27685 Add compiled scripts 2015-10-03 16:51:49 +09:30
Toby Zerner
e824f5ebf7 Update for composer branch 2015-10-03 16:51:29 +09:30
Toby Zerner
6bf47adb14 Remove English translations 
They're now in flarum/english.
 2015-10-03 16:51:05 +09:30
Toby Zerner
9bb30a1cc3 Add vendor to JS namespace 2015-10-03 16:48:37 +09:30
Toby Zerner
5c46e03750 Use new BuildClientView API 2015-10-03 16:44:20 +09:30
Toby Zerner
b9e2f8e660 Fix slug unique rule 2015-09-24 08:45:53 +09:30
Daniel Klabbers
144e9333ea added slug validation 2015-09-23 23:42:12 +02:00
Toby Zerner
fc1580122c Update for discussion list padding change 2015-09-22 19:30:06 +09:30
Toby Zerner
79d664750b Update for hidden discussions feature, new Flags extension 2015-09-22 18:27:02 +09:30
Toby Zerner
1bf1403f82 Add permission grid icon 2015-09-22 18:01:26 +09:30
Toby Zerner
3146e9bc03 SettingsRepository is a default dep for migrations now 2015-09-18 13:30:52 +09:30
Toby Zerner
790bf44a98 Use SettingsModal component 2015-09-18 13:30:21 +09:30
Toby Zerner
023f946720 Add option to set tags as default route 2015-09-17 12:57:47 +09:30
Toby Zerner
f214d32f2f Add gitattributes 2015-09-17 09:08:24 +09:30