mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-21 23:56:33 +02:00
Code Issues Releases Wiki Activity
8,745 Commits 87 Branches 54 Tags
f8577c8078cee9acbf51a10e370a6b392ca2b26d
Commit Graph

8745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Toby Zerner
9a3da76444 Merge pull request #26 from dcsjapan/fix-comments 
Revise "reused strings" commenting to match core
 2015-10-22 17:02:27 +10:30
Toby Zerner
5f9f4a1536 Allow hyphens in referenced key names 2015-10-22 17:01:21 +10:30
Toby Zerner
b299bd36e8 Add flood control 
closes #271
 2015-10-22 16:57:48 +10:30
Toby Zerner
5861c95d08 Add rate limit (flood control) error message 2015-10-22 16:56:59 +10:30
dcsjapan
d0a0fe7e06 Revise "reused strings" commenting to match core 
- Fixes commenting on two files where I accidentally used an old version.
 2015-10-22 15:26:58 +09:00
Toby Zerner
a638945cef Merge pull request #5 from dcsjapan/key-reorganization 
Reorganize key names
 2015-10-22 16:53:50 +10:30
Toby Zerner
356293ffc6 Merge pull request #25 from dcsjapan/subs-key-reorganization 
Reorganize key names for Subscriptions
 2015-10-22 16:53:34 +10:30
dcsjapan
bb4ea25842 Reorganize key names for Subscriptions 
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.
 2015-10-22 15:19:50 +09:00
dcsjapan
9368030813 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-22 14:49:38 +09:00
Toby Zerner
5e734ca5c9 Improve embed architecture 
- Fix composer preview button not working
- Fix inappropriate alert message when reply is submitted
 2015-10-22 12:28:17 +10:30
Toby Zerner
b482fb93c5 Clean up some old code 2015-10-22 12:25:22 +10:30
Toby Zerner
86b8875050 Merge pull request #23 from dcsjapan/reuse-sticky 
Clean up reused "sticky" string
 2015-10-22 11:31:42 +10:30
dcsjapan
02d0b35173 Clean up reused "sticky" string 
- Adds a reused string and two references
 2015-10-22 10:00:21 +09:00
Toby Zerner
50e838e990 Remove unused notification component 2015-10-22 11:14:11 +10:30
Toby Zerner
5cef24a4af Merge pull request #1 from dcsjapan/key-reorganization 
Reorganize key names
 2015-10-22 11:13:24 +10:30
Toby Zerner
2c87f36869 Merge pull request #601 from dcsjapan/badge-key-rename 
Rename the key for the "Hidden" badge tooltip
 2015-10-22 11:11:36 +10:30
Toby Zerner
7fa9831dd2 Merge pull request #4 from dcsjapan/badge-key-rename 
Rename the key for the "Locked" badge tooltip
 2015-10-22 11:11:29 +10:30
Toby Zerner
1ae2f49c05 Merge pull request #21 from dcsjapan/sticky-key-reorganization 
Reorganize key names for Sticky
 2015-10-22 11:11:22 +10:30
Toby Zerner
07ff5fcb21 Merge pull request #22 from dcsjapan/badge-key-rename 
Rename keys for badge tooltips
 2015-10-22 11:11:14 +10:30
dcsjapan
fa7aa742d4 Rename keys for badge tooltips 
- Shortens two key names for consistency with `badge:` namespace.
- Supports https://github.com/flarum/core/pull/601
- Supports https://github.com/flarum/lock/pull/4
 2015-10-22 09:39:25 +09:00
dcsjapan
1ec39e9b00 Rename the key for the "Locked" badge tooltip 
- Shortens the key name for consistency with `badge:` namespace.
- Revised YAML to follow.
 2015-10-22 09:35:34 +09:00
dcsjapan
c260d3557f Rename the key for the "Hidden" badge tooltip 
- Shortens the key name for consistency with `badge:` namespace.
- Revised YAML to follow.
 2015-10-22 09:31:13 +09:00