 Wyatt Johnson
|
e3cdad1f2a
|
added asset re-write
|
2018-01-16 16:47:05 -07:00 |
|
|
Wyatt Johnson
|
66cfd20f7b
|
Merge branch 'master' into master
|
2018-01-16 16:00:37 -07:00 |
|
|
Wyatt Johnson
|
af40a85071
|
Merge branch 'master' into master
|
2018-01-16 15:58:58 -07:00 |
|
|
Wyatt Johnson
|
b11a730373
|
Merge branch 'master' into reply-on-hidden-comment
|
2018-01-16 14:13:13 -07:00 |
|
|
Wyatt Johnson
|
b709cb485e
|
refactored publicCreate
|
2018-01-16 14:11:24 -07:00 |
|
|
Kiwi
|
13fc91b355
|
Merge pull request #1287 from coralproject/ci-time-sync
CI Time Sync
|
2018-01-16 20:53:13 +01:00 |
|
|
Wyatt Johnson
|
9eec280868
|
added time syncing
|
2018-01-16 12:31:45 -07:00 |
|
|
Wyatt Johnson
|
45d4c79c26
|
added reply bug
|
2018-01-16 12:30:38 -07:00 |
|
|
Kiwi
|
1cf2bda36c
|
Merge pull request #1286 from coralproject/e2e-pause
Add a little pause in e2e test
|
2018-01-16 19:44:21 +01:00 |
|
|
Chi Vinh Le
|
b1adfe8c46
|
Add a little pause in e2e test
|
2018-01-16 19:33:07 +01:00 |
|
|
Chi Vinh Le
|
6aece16fd0
|
Add userFlagged subscription
|
2018-01-16 11:31:44 +01:00 |
|
|
okbel
|
2684ac4933
|
missing brackets
|
2018-01-15 13:14:24 -03:00 |
|
|
okbel
|
1f0e9da5d0
|
Merge branch 'formatting' of github.com:coralproject/talk into formatting
* 'formatting' of github.com:coralproject/talk:
prettier
End of line
More syncs
Fix deselect bug of action menu in ff
|
2018-01-15 13:00:07 -03:00 |
|
|
okbel
|
bfa2f6edb9
|
Updates
|
2018-01-15 12:59:39 -03:00 |
|
|
Kiwi
|
ea7998257c
|
Merge branch 'master' into action-index
|
2018-01-15 16:02:53 +01:00 |
|
|
Wyatt Johnson
|
25c178b267
|
Merge branch 'master' into formatting
|
2018-01-12 17:23:35 -07:00 |
|
|
Wyatt Johnson
|
7885b025ee
|
Merge pull request #1262 from coralproject/firefox-actionmenu-deselect
Fix deselect bug of action menu in ff
|
2018-01-12 16:49:04 -07:00 |
|
|
Wyatt Johnson
|
3606726c4b
|
Merge branch 'master' into firefox-actionmenu-deselect
|
2018-01-12 16:33:55 -07:00 |
|
|
Wyatt Johnson
|
d69b1f98c8
|
Merge branch 'master' into action-index
|
2018-01-12 15:50:02 -07:00 |
|
|
okbel
|
77d83e04d5
|
Wrong name
|
2018-01-12 15:53:32 -03:00 |
|
|
okbel
|
86c4d70daf
|
Adding changes to the comments on the User Drawer Detail
|
2018-01-12 15:51:49 -03:00 |
|
|
okbel
|
e256b0da8a
|
Adding format to admin comment - CommentFormatter
|
2018-01-12 15:47:09 -03:00 |
|
|
Wyatt Johnson
|
93bda87ad0
|
Merge pull request #1153 from coralproject/next
Release 4.0.0
|
2018-01-12 09:43:40 -07:00 |
|
|
Chi Vinh Le
|
1ccd36e9e9
|
prettier
|
2018-01-12 14:07:05 +01:00 |
|
|
Tibo Beijen
|
bf77ddc49b
|
Merge branch 'master' into master
|
2018-01-12 13:54:31 +01:00 |
|
|
daan944
|
ebe6341b01
|
Merge pull request #1 from sanoma/feature/MDN-10616_translation_additions
Feature/mdn 10616 translation additions
|
2018-01-12 13:45:20 +01:00 |
|
|
d.luijten
|
34a0e314e8
|
After discussion: changed status to shorter “Pre-moderatie”
|
2018-01-12 13:44:29 +01:00 |
|
|
Chi Vinh Le
|
9762f34324
|
End of line
|
2018-01-12 11:45:52 +01:00 |
|
|
d.luijten
|
951f16f0a1
|
Improved email message: ‘je gebruiker’ is always referred to as ‘je account’. Also, simplified ‘Diens inhoud’ to ‘de inhoud van je gebruikersnaam’.
|
2018-01-12 11:32:48 +01:00 |
|
|
Chi Vinh Le
|
9ce14acc9a
|
More syncs
|
2018-01-12 11:23:29 +01:00 |
|
|
d.luijten
|
988b39f19d
|
Fixed call-to-action: “Kom in gesprek!” sounds a bit weird to me.
|
2018-01-12 11:20:29 +01:00 |
|
|
d.luijten
|
9333b407bb
|
Fixed consistency: Community guidelines are used both with and without capital C. Chose to go for the version without capital C, since it’s not a title.
|
2018-01-12 11:19:21 +01:00 |
|
|
d.luijten
|
8867fd54f3
|
Fixed consistency: “Voor-mod” is never used. “Pre-moderatie” would be acceptable, but “Wachtend op moderatie” sounds more like the correct status message.
|
2018-01-12 11:14:51 +01:00 |
|
|
d.luijten
|
56bd3041d6
|
Fixed consistency: a “bio” has been both named “biografie” and “bio”. Chose “biografie” for now.
|
2018-01-12 11:11:09 +01:00 |
|
|
d.luijten
|
a53bb6650a
|
Fixed SI units.
|
2018-01-12 11:10:30 +01:00 |
|
|
d.luijten
|
0a99ae50b1
|
Fixed consistency: “Afgewezen wachtrij” implies that this name is used more frequently, but it isn’t.
|
2018-01-12 11:10:06 +01:00 |
|
|
Tibo Beijen
|
6bad3fdc2f
|
Dotted some sentences.
|
2018-01-12 09:09:21 +01:00 |
|
|
Wyatt Johnson
|
c19a6c8b10
|
Merge branch 'next' into firefox-actionmenu-deselect
|
2018-01-11 20:25:18 -07:00 |
|
|
Wyatt Johnson
|
0abc2ca243
|
replaced eslint:recommended with prettier
|
2018-01-11 20:00:34 -07:00 |
|
|
Wyatt Johnson
|
d56c19016a
|
Merge pull request #1279 from coralproject/docs
Updated docs for 4.0
|
2018-01-11 17:53:12 -07:00 |
|
|
Kim Gardner
|
bb9a93986e
|
Small wording tweak
|
2018-01-11 19:41:45 -05:00 |
|
|
Kim Gardner
|
c906b2df5e
|
Merge branch 'next' into docs
|
2018-01-11 19:36:58 -05:00 |
|
|
Wyatt Johnson
|
204b442e2f
|
added deprecation warning
|
2018-01-11 17:32:52 -07:00 |
|
|
Wyatt Johnson
|
876f4ef700
|
updated docs for 4.0
|
2018-01-11 16:51:08 -07:00 |
|
|
Wyatt Johnson
|
7f02d4f39c
|
fixed circle.yml
|
2018-01-11 15:54:46 -07:00 |
|
|
Kim Gardner
|
c1f5450b9a
|
Merge branch 'master' into next
|
2018-01-11 17:43:43 -05:00 |
|
|
Wyatt Johnson
|
7f291cf056
|
Merge pull request #1276 from coralproject/email-send-fix
Missing Email Error
|
2018-01-11 15:28:18 -07:00 |
|
|
Wyatt Johnson
|
7706a0521c
|
Merge branch 'next' into email-send-fix
|
2018-01-11 15:28:11 -07:00 |
|
|
Wyatt Johnson
|
81d2927c0f
|
Merge pull request #1278 from coralproject/plugin-context
Plugin context
|
2018-01-11 15:27:50 -07:00 |
|
|
Wyatt Johnson
|
f2698298f7
|
Merge branch 'next' into plugin-context
|
2018-01-11 15:27:04 -07:00 |
|