github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 06:53:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
462 Commits 86 Branches 50 Tags 181 MiB
8c5bbe1f74
Commit Graph

440 Commits

Author SHA1 Message Date
NomisCZ
812b1f5c1b Merge branch 'master' of https://github.com/flarum/tags 2019-06-04 20:50:59 +02:00
NomisCZ
11fae08b50 Add custom icon functionality 
Add database 'icon' column
Add admin modal icon field
Add icon render to TagHero, tagLabel
Change tagIcon helper functionality
 2019-06-04 20:49:16 +02:00
Thomas Lang
0536d10739 if a tag does not exist, we dont want the query to crash (#61) 
* if a tag does not exist, we dont want the query to crash

* incorrect solution
Revert "if a tag does not exist, we dont want the query to crash"

This reverts commit 6680e5a6e838ff9f53d338581d655671597b7bc5.

* repaired getIdForSlug function to return int or null

* changed where, removed isempty not needed
 2019-06-03 12:00:23 +02:00
flarum-bot
554e906c2b Bundled output for commit c65aa52726 [skip ci] 2019-06-03 09:48:09 +00:00
David Sevilla Martín
c65aa52726 Update code to work with latest html5sortable (#62) 
* Update code to work with latest html5sortable (0.9.16)

* Move forEach function callback to constant variable

* Extract inline function into method
 2019-06-03 11:46:48 +02:00
Franz Liedke
6d0de4b29c Update changelog 2019-02-15 00:30:04 +01:00
flarum-bot
20f6c33113 Bundled output for commit 06b2968636 [skip ci] 2019-02-13 19:09:47 +00:00
Franz Liedke
06b2968636 Update JS dependencies to fix vulnerable packages 2019-02-13 20:08:05 +01:00
Daniël Klabbers
c18731953d revert the fix index names logic, preparing for illuminate 5.7 2019-01-15 21:00:38 +01:00
Franz Liedke
d4783f4ac5 Get rid of event subscribers that resolve services too early, part 1 
Refs flarum/core#1578.
 2018-12-16 15:14:00 +01:00
Toby Zerner
85bc128e4f Add changelog 2018-12-07 09:12:19 +10:30
Franz Liedke
c7c4046d03 Revert "Explicitly create tags table with InnoDB engine" 
This reverts commit b8b72e51af.
 2018-12-06 00:34:15 +01:00
Toby Zerner
1b78395d9a Include full last discussion info 
Fixes flarum/core#1662
 2018-12-05 09:05:07 +10:30
Franz Liedke
b8b72e51af Explicitly create tags table with InnoDB engine 
Refs flarum/core#1675.
 2018-12-04 10:20:22 +01:00
Toby Zerner
6ccb297af4 Fix travis builds 2018-12-04 10:16:33 +10:30
Franz Liedke
e2004c2dcb Migrations: Fix dropping foreign keys 
Passing an array to dropForeign does not mean dropping multiple indices,
but rather dropping a key on multiple tables.

Passing a string means that this string will be interpreted as index
name, not as name of the indexed column. Passing an array with one
string is therefore correct, in order to benefit from automatic index
name generation.
 2018-11-30 14:05:04 +01:00
Toby Zerner
d08bb264b4 Fix index names in migrations 
This can be reverted when we upgrade to Laravel 5.7.
 2018-11-27 22:34:26 +10:30
Toby Zerner
4483b7fee7 Remove sudo: false 
See https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration
 2018-11-21 18:57:15 +10:30
flarum-bot
b8aebc50ca Bundled output for commit 5e77878a2f [skip ci] 2018-11-21 08:24:30 +00:00
Toby Zerner
5e77878a2f Make npm package private, update deps, change watch to dev 2018-11-21 18:46:21 +10:30
Toby Zerner
cbc6b4aa81 Remove copyright year from LICENSE 2018-11-21 18:37:21 +10:30
flarum-bot
d09070d510 Bundled output for commit 9890dc4150 [skip ci] 2018-11-17 08:29:19 +00:00
Toby Zerner
9890dc4150 Update dependencies 2018-11-17 18:53:39 +10:30
flarum-bot
8400a68e57 Bundled output for commit 98e89a0b5b [skip ci] 2018-11-15 06:08:39 +00:00
Toby Zerner
98e89a0b5b Prefix compat exports 2018-11-15 16:37:31 +10:30
flarum-bot
e2db1b6d40 Bundled output for commit 6972e7aea0 [skip ci] 2018-11-15 05:49:41 +00:00
Toby Zerner
6972e7aea0 Expose compat API on admin frontend 2018-11-15 16:18:38 +10:30
flarum-bot
1650d530e9 Bundled output for commit 4aabd35605 [skip ci] 2018-11-07 21:16:41 +00:00
Clark Winkelmann
4aabd35605 Use ItemList for EditTagModal fields (#59) 2018-11-07 22:15:31 +01:00
flarum-bot
8a99757648 Bundled output for commit ab236f3f68 [skip ci] 2018-10-21 04:53:04 +00:00
Toby Zerner
ab236f3f68 Rename package 2018-10-21 15:16:22 +10:30
Toby Zerner
3e7d3dd577 Rename package 2018-10-17 13:44:48 +10:30
David Sevilla Martín
f9744b5f98 Remove unused import 2018-10-06 08:37:28 -04:00
David Sevilla Martín
f9d50ec67d Do not hide discussions if query contains gambits 2018-10-06 08:36:39 -04:00
David Sevilla Martín
424dde9ea1 Do not hide tags from Following (subscriptions) 
Closes flarum/core#1232
 2018-10-05 19:52:34 -04:00
flarum-bot
73c519e3ee Bundled output for commit 7de5770d5b [skip ci] 2018-09-22 21:51:01 +00:00
Clark Winkelmann
7de5770d5b Use new newDiscussion method after core promise cleanup (#51) 2018-09-22 23:49:40 +02:00
Toby Zerner
0d316f7f0f Make "own" permissions depend on the user's ability to reply 
See https://github.com/flarum/core/pull/1513
 2018-09-22 12:18:40 +09:30
Toby Zerner
a58c8cd998 Rename bootstrap.php 2018-09-21 11:44:33 +09:30
flarum-bot
49c87caa16 Bundled output for commit a3e1dcc910 [skip ci] 2018-09-21 00:45:09 +00:00
Toby Zerner
a3e1dcc910 Update dependencies 2018-09-21 10:14:04 +09:30
flarum-bot
2a33d241a4 Bundled output for commit 2dac4d075d [skip ci] 2018-09-16 18:53:38 +00:00
Toby Zerner
2dac4d075d Database changes (#53) 
* Implement database changes

* Apply fixes from StyleCI

* Update post column

* Split foreign keys into their own migrations, rename pivot tables

* Update pivot table references

* Update column name

* Update core columns

* Remove unnecessary argument

* Use whereColumn

* Update core attribute names

* Rename attributes
 2018-09-16 20:51:51 +02:00
Franz Liedke
dd1f2d46fd Ensure compatibility with DB table prefix 2018-08-03 01:21:58 +02:00
Franz Liedke
dfaf1bad09 Use Frontend extender for registering forum routes 2018-07-23 16:35:30 +02:00
Franz Liedke
3129ee5b4b Use new Frontend extender 
See flarum/core#851.
 2018-07-23 16:34:56 +02:00
Toby Zerner
607132a68f Only do time comparison if setting is numeric 2018-07-21 18:44:44 +09:30
Toby Zerner
2dd8514d62 Reduce tag description font size 
ref flarum/core#1488
 2018-07-20 11:42:19 +09:30
Toby Zerner
5318865a51 Maintain "Start a discussion" button width on tags page 
fixes flarum/core#1487
 2018-07-20 11:41:21 +09:30
Toby Zerner
2c6a2b2d70 Webpack (#52) 
See https://github.com/flarum/core/pull/1367

* Replace gulp with webpack and npm scripts for JS compilation
* Set up Travis CI to commit compiled JS
* Restructure `js` directory; only one instance of npm, forum/admin are "submodules"
* Maintain partial compatibility API (importing from absolute paths) for extensions
* Restructure `less` directory
 2018-06-20 13:31:45 +09:30
Franz Liedke
3718d5dcec Get rid of obsolete ControllerInterface 
See flarum/core#1443.
 2018-05-30 09:55:11 +02:00
Franz Liedke
392ae3db0a Remove unnecessary parameter in migration closure 2018-05-30 09:52:56 +02:00
Clark Winkelmann
e029cdff87 Fix history usage (introduces new translation) 2018-05-24 18:50:54 +02:00
Clark Winkelmann
a7ebbf1035 Use Page component for Tags page 2018-05-24 18:50:11 +02:00
Clark Winkelmann
69057183e0 Remove unused color variable 2018-05-24 18:18:39 +02:00
Ammar Fadhlur Rahman
21443d95b4 Change fa icon prefix to fas 2018-05-10 15:06:30 +07:00
Charlie
0f75139a51 Fix ordering bug 
If an empty request is sent to the /tags/order endpoint, all tags
would get moved to secondary tags.
 2018-03-19 22:49:25 +01:00
Franz Liedke
8d74b40e49 Please StyleCI 2018-03-18 22:36:10 +01:00
Arseny Sysolyatin
7ae7603342 Implement negation for tag gambit 
Closes #42.
 2018-03-18 20:31:18 +01:00
AFR
5506b3f76f Adapt to FontAwesome v5.0.6 icon name changes (#47) 2018-02-23 23:46:24 +01:00
Franz Liedke
4bede59dfc Adapt comment for flarum/core#875 2018-02-11 16:41:23 +01:00
Franz Liedke
ab9877cc3b Use Routes extender 2018-02-08 18:34:40 +01:00
Franz Liedke
7667b80bf7 Flatten logic 
With an early return, the method becomes more readable, and the
actual (very small) change from #46 becomes more apparent.
 2018-02-08 17:14:28 +01:00
Toby Zerner
26483cc0c5 Realign tags in discussion list 2018-02-06 17:24:09 +10:30
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