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

8781 Commits

Author SHA1 Message Date
Jan Dorsman
1dcbd6e22f WIP IP Logging 2015-10-27 21:53:21 +01:00
Kirk Bushell
b54f56a683 Added tests for invalid confirmation token handling 2015-10-27 14:47:03 +00:00
Kirk Bushell
765b894084 Added more tests 2015-10-27 13:22:30 +00:00
Kirk Bushell
47a9787116 Added output test for flooding exception handler 2015-10-27 12:54:10 +00:00
Kirk Bushell
903bb27697 Fied broken test 2015-10-27 12:50:11 +00:00
Kirk Bushell
067f87eacb Updated tests namespace to be ps4-valid. Added tests for flooding exception, fixed broken code 2015-10-27 12:48:27 +00:00
Toby Zerner
9e725ca48a Recompile JS 2015-10-27 12:40:35 +10:30
Toby Zerner
36b81b55bb Recompile JS 2015-10-27 12:40:16 +10:30
Toby Zerner
090d2ad2dd Recompile JS 2015-10-27 12:40:10 +10:30
Toby Zerner
2aeb6087bb Recompile JS 2015-10-27 12:39:58 +10:30
Toby Zerner
9732e1d6a1 Recompile JS 2015-10-27 12:39:51 +10:30
Toby Zerner
f637b160fd Recompile JS 2015-10-27 12:38:24 +10:30
Toby Zerner
6dbdd7d657 Recompile JS 2015-10-27 12:17:44 +10:30
Toby Zerner
7aa46e99cb Recompile JS 2015-10-27 12:17:34 +10:30
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