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

8867 Commits

Author SHA1 Message Date
Toby Zerner
53444845cc Recompile JS 2015-10-27 12:17:15 +10:30
Toby Zerner
f7e815f6e6 Recompile JS 2015-10-27 12:17:08 +10:30
Toby Zerner
db375498a1 Recompile JS 2015-10-27 12:17:02 +10:30
Toby Zerner
56d4fb1c73 Recompile JS 2015-10-27 12:16:54 +10:30
Toby Zerner
2e1bc6eece Recompile JS 2015-10-27 12:16:47 +10:30
Toby Zerner
6ac115edf5 Recompile JS 2015-10-27 12:16:37 +10:30
Toby Zerner
8e5a19962f Recompile JS 2015-10-27 12:16:28 +10:30
Toby Zerner
71bb3eadcd Extract method to get the permalink to a post
Necessary so that the embed extension can override it.
2015-10-27 12:09:24 +10:30
Toby Zerner
fc339254cf Trim the /embed prefix off of post permalinks 2015-10-27 12:08:42 +10:30
Toby Zerner
40c32e1b3a Show sidebar items at top of embed 2015-10-27 12:03:03 +10:30
Toby Zerner
640c6199ef Merge pull request #606 from flarum/error-handling
Use exception handlers instead of JsonApiSerializableInterface
2015-10-27 11:43:07 +10:30
Toby Zerner
d2d167cb48 Use exception handlers instead of JsonApiSerializableInterface 2015-10-26 11:14:48 +10:30
Toby Zerner
ebc82f1a95 Merge pull request #37 from dcsjapan/plural-alert
Pluralize the post liked notification string
2015-10-24 14:24:07 +10:30
dcsjapan
edc98bfe71 Pluralize the post liked notification string
- Adds a comment to indicate a pluralizable string.
- Supports https://github.com/flarum/likes/commit/e867b54.
2015-10-24 12:36:30 +09:00
Toby Zerner
aea8b17175 Improve logic to see if post has been fully loaded
Should fix #295 once and for all.
2015-10-24 13:17:25 +10:30
Toby Zerner
aeeb16cb86 i18n: Make cross-file translation references work 2015-10-24 13:16:26 +10:30
Toby Zerner
553414e672 i18n: Pluralise notification text 2015-10-24 13:15:18 +10:30
Toby Zerner
3d7fcaa2b2 Truncate list of replies, pluralize notification text
ref flarum/core#597
2015-10-24 13:14:57 +10:30
Toby Zerner
2672835b8d Merge pull request #36 from dcsjapan/add-others
Add an "others" key for Likes notifications
2015-10-24 12:43:20 +10:30
dcsjapan
b3dbe065c4 Add an "others" key for Likes notifications
- Adds a key I overlooked in the reorganization.
2015-10-24 11:11:44 +09:00
Toby Zerner
2b49987ff3 i18n: Use new translation strings
closes flarum/core#527
2015-10-24 12:27:53 +10:30
Toby Zerner
50b9245bff Merge branch 'pluralize-others' of https://github.com/dcsjapan/flarum-english
# Conflicts:
#	locale/flarum-mentions.yml
2015-10-24 11:56:04 +10:30
Toby Zerner
de61e492cb Merge pull request #35 from dcsjapan/pluralize-alert
Pluralize the post mentioned notification string
2015-10-24 11:53:49 +10:30
dcsjapan
07c849e780 Merge reused strings into core
- Merges two strings from Likes and Mentions into the core YML.
- Adds commenting to core YML to indicate strings referenced by extensions.
- Changes `others_link` to `others_text` in Mentions.
- Removes obsolete `ref:` namespace from Mentions.
2015-10-24 10:14:20 +09:00
Toby Zerner
66f0bf2755 Merge pull request #32 from maelsoucaze/reply
Merge Reply references into a reused string
2015-10-23 20:33:45 +10:30
Toby Zerner
502811a590 Merge pull request #33 from dcsjapan/confirm-okay
Use "OK" for submit button in Choose Tags modal
2015-10-23 20:33:23 +10:30
dcsjapan
5b70099030 Use "OK" for submit button in Choose Tags modal 2015-10-23 18:48:40 +09:00
Maël Soucaze
9c0a4447a7 Merge Reply references into a reused string
Two strings use *Reply*, it's not necessary to translate it twice. The
newly `core.ref.reply` reused string fix that.
2015-10-23 11:37:49 +02:00
Toby Zerner
36798e97ad Merge pull request #31 from maelsoucaze/master
Modify the label for the notification setting
2015-10-23 19:19:39 +10:30
Maël Soucaze
e6288800e1 Fix a missing word 2015-10-23 08:56:56 +02:00
Maël Soucaze
466e526161 Modify the label for the notification setting 2015-10-23 08:54:07 +02:00
dcsjapan
0016b73725 Pluralize the post mentioned notification string
- Adds a comment to indicate a pluralizable string.
- Supports https://github.com/flarum/mentions/pull/13.
2015-10-23 15:51:32 +09:00
Franz Liedke
ae4e0728db Merge pull request #28 from dcsjapan/likes-key-reorganization
Reorganize key names for Likes
2015-10-23 08:19:48 +02:00
dcsjapan
9b70bee805 Modify the label for the notification preference setting 2015-10-23 15:18:23 +09:00
Toby Zerner
d3b5209f76 Merge pull request #30 from dcsjapan/mentions-key-reorganization
Reorganize key names for Mentions
2015-10-23 16:23:28 +10:30
dcsjapan
06fcb39fb4 Reorganize key names for Mentions
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
- Adds comments to indicate pluralizable strings.
- Supports https://github.com/flarum/mentions/pull/12.
2015-10-23 14:49:15 +09:00
Toby Zerner
61d8e8714d Merge pull request #12 from dcsjapan/key-reorganization
Reorganize key names
2015-10-23 16:14:59 +10:30
dcsjapan
792afbb476 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.
- Changes an instance of `punctuate` to `punctuateSeries`.
- Modifies the syntax of **addMentionedByLIst.js** slightly.
2015-10-23 14:41:31 +09:00
Toby Zerner
4d3f6a2c15 Merge pull request #3 from dcsjapan/key-reorganization
Reorganize key names
2015-10-23 13:29:54 +10:30
dcsjapan
1d83d4dc0d Reorganize key names for Likes
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
- Adds a comment to indicate a pluralizable string.
- Supports https://github.com/flarum/likes/pull/3.
2015-10-23 11:31:53 +09:00
dcsjapan
5836f1062f 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.
2015-10-23 11:29:32 +09:00
Toby Zerner
1a36ef50d5 Merge pull request #22 from dcsjapan/key-reorganization
Reorganize key names
2015-10-23 12:03:23 +10:30
Toby Zerner
4c6e4dc995 Merge pull request #27 from dcsjapan/tags-key-reorganization
Reorganize key names for Tags
2015-10-23 12:03:19 +10:30
dcsjapan
80de9f95c5 Reorganize key names for Tags
See [flarum/core #265](https://github.com/flarum/core/issues/265).

- Adjusts key names to three-tier namespacing.
- Adds newly extracted strings.
- Adds commenting to match core.
- Supports https://github.com/flarum/tags/pull/22.
- (Also adjusts one string in **flarum-subscriptions.yml**.)
2015-10-23 10:11:34 +09:00
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
d6691e6299 Don't let users view discussions without permission
closes #599
2015-10-22 21:52:31 +10:30
Franz Liedke
c61f49efbc Recompile JavaScript 2015-10-22 10:52:07 +02:00
Franz Liedke
8ae21a630d Prevent "and 1 others" in list of likes
Refs flarum/core#546.
2015-10-22 10:38:28 +02:00
Franz Liedke
c41ff409cd Recompile JavaScript 2015-10-22 10:20:01 +02:00
Franz Liedke
73c02f66e7 Recompile JavaScript 2015-10-22 10:16:08 +02:00