1
0
mirror of https://github.com/flarum/core.git synced 2025-08-23 00:23:25 +02:00
Commit Graph

8740 Commits

Author SHA1 Message Date
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
dab6db7907 Add compiled JS 2015-10-03 16:59:53 +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
1fddd3f157 Merge branch 'master' into composer 2015-10-03 16:41:23 +09:30
Toby Zerner
4083b9a33f API: Reverse splitting of BuildClientView event, but add checker methods 2015-10-03 16:40:41 +09:30
Toby Zerner
520d52a048 Update for composer branch, add svg icon 2015-10-03 16:25:17 +09:30
Toby Zerner
d2cb4c2d77 Add some bundled extension translations
But the key names are still yet to be redone.
2015-10-03 16:24:08 +09:30
Toby Zerner
28ec7aa27a Merge pull request #571 from mikechristopher/patch-1
Read documentation link broken
2015-10-03 07:03:40 +09:30
Mike Nolan
982e1ba4fa Read documentation link broken
This fixes #510 by putting in the link to the themes documentation
2015-10-02 17:24:01 +01:00
Toby Zerner
54329418a0 Merge branch 'master' into composer 2015-10-02 17:57:24 +09:30
Toby Zerner
1a05171a8e Allow extension icon styles to reference assets
Example usage:

"icon": {
    "backgroundImage": "url('{$assets}/icon.svg')"
}
2015-10-02 17:55:42 +09:30
Toby Zerner
f96ef33973 Remove ability for extensions to register a service provider
The concept of returning a bootstrapper function is simpler and the use of service providers had no advantage over it.
2015-10-02 17:54:53 +09:30
Toby Zerner
91aab4cd21 Change migration namespace format 2015-10-02 17:49:43 +09:30
Toby Zerner
60467540fe Use composer.json for extension metadata 2015-10-02 17:49:16 +09:30
Toby Zerner
c1e84a0d3e Add server 2015-10-02 17:47:12 +09:30
Toby Zerner
eba0d480cc Merge branch 'master' of https://github.com/flarum/core 2015-10-02 17:44:30 +09:30
Toby Zerner
295572173c Only include namespaced translations 2015-10-02 17:43:41 +09:30
Toby Zerner
395bbb04bd API: Split BuildClientView into two separate events
Much easier to work with. Extension stub hasn't been updated yet.
2015-10-02 17:42:34 +09:30
Toby Zerner
127c54bc1c Add multiple UrlGenerator classes for forum/api/admin
Spent quite a while looking into the best solution here and ended up going with three separate classes. Thanks to @Luceos for the PR that got this rolling (#518). My reasoning is:

- The task of routing and URL generation is independent for each section of the app. Take Flarum\Api\Users\IndexAction for example. I don't want to generate a URL to a Flarum route... I specifically want to generate a URL to an API route. So there should be a class with that specific responsibility.
- In fact, each URL generator is slightly different, because we need to add a certain prefix to the start (e.g. /api)
- This also allows us to get rid of the "flarum.api" prefix on each route's name.
- It's still DRY, because they all extend a base class.

At the same time, I could see no reason this needed to be "interfaced", so all of the classes are concrete.

Goes a long way to fixing #123 - still just a few places left remaining with hardcoded URLs.
2015-10-02 17:35:29 +09:30
Toby Zerner
7a927fbe18 Add asset compilation script 2015-10-02 17:23:08 +09:30
Toby Zerner
394807d045 Merge pull request #563 from dcsjapan/namespace-fix
Add "forum" namespacing to previously renamed core keys
2015-10-02 17:10:13 +09:30
dcsjapan
2183daa70e Fixes core.deleted_username as well. 2015-10-02 16:37:09 +09:00
dcsjapan
f2f03cc6e4 Add "forum" namespacing to previously renamed core keys
- Does not affect "core.deleted_user" global string.
- Corresponding YAML will be sent later w/ more extracted strings.
2015-10-02 15:54:39 +09:00
Toby Zerner
7fe52f2494 Fix suspend modal submit button 2015-10-01 15:15:52 +09:30
Toby Zerner
0caaea8c50 Fix scrubber dragging division by zero
closes #64
2015-09-29 17:46:05 +09:30
Toby Zerner
be8c79183e Update docblocks 2015-09-29 16:41:34 +09:30
Toby Zerner
06355b54f9 Properly mark all notifications as read
Previously, clicking the "mark all notifications as read" button would individually mark each of the visible notifications as read. Since we now always show a badge with the number of unread notifications, we need to make sure that all notifications (not just the visible ones) can be marked as read. Otherwise it would be possible to get stuck with an unread badge there.

This commit adds a new API endpoint which marks *all* of a user's notifications as read. The JSON-API spec doesn't cover this kind of thing (updating all instances of a certain resource type), so I'm a bit unsure regarding what the endpoint should actually be. For now I've gone with POST /notifications/read, but I'm open to suggestions.

ref #500
2015-09-29 16:41:05 +09:30
Toby Zerner
e81c94961e Remove "go to email provider" translations
ref flarum/core#541
2015-09-29 15:20:02 +09:30
Toby Zerner
81e6ab664a Properly handle errors in change email modal 2015-09-29 15:19:06 +09:30
Toby Zerner
470a3d20e2 Remove "go to email provider" buttons
closes #541
2015-09-29 15:18:55 +09:30
Toby Zerner
247d8116b0 Add missing semicolon 2015-09-29 14:29:40 +09:30
Franz Liedke
f5c9fd5d8d Update both unread and new notification count when a new notification appears
Related to flarum/core#500.
2015-09-29 01:39:44 +02:00
Franz Liedke
44e634ea47 Remove unused import 2015-09-29 01:31:34 +02:00
Franz Liedke
68215b4e0f Make linter happy 2015-09-29 01:31:09 +02:00
Franz Liedke
16992aa1fb Sync notification count when clicking on them or marking all as read
Refs #500.
2015-09-29 01:28:47 +02:00
Franz Liedke
66d4e51a18 Use correct method for notification drawer on mobile
Refs #500.
2015-09-29 01:28:47 +02:00
Franz Liedke
0bef17149c Return both unread and new notification count from the API
Related to #500.
2015-09-29 01:28:47 +02:00
Franz Liedke
e4b90296bc Merge pull request #554 from kirkbushell/feature/admin-tests
Admin tests
2015-09-29 00:59:09 +02:00
Franz Liedke
a436bef93c Implement third state for notification list dropdown
Related to #500.
2015-09-29 00:50:28 +02:00
kirkbushell
9198e96385 Added tests for admin login/cookie checks 2015-09-28 16:02:37 +01:00
kirkbushell
a4c61efee2 Added zend-stragility (missing), removed some redundant code. 2015-09-28 15:59:07 +01:00
Franz Liedke
da4dad3bb8 Merge pull request #553 from kirkbushell/feature/settings-tests
Tests for core settings code
2015-09-28 16:47:04 +02:00
kirkbushell
374e9f09e4 Moved psr-4 loading for tests out of the autoload 2015-09-28 15:44:35 +01:00
kirkbushell
a388fe7883 Added some tests for the database setting repository 2015-09-28 15:34:32 +01:00
kirkbushell
b93d5570d0 Removed phpsec as the testing library, added phpunit and converted the first spec test to phpunit format. Also added mockery. 2015-09-28 15:09:13 +01:00