a59464e45d
Merge branch 'notify-on-edit' of ssh://github.com/coralproject/talk into notify-on-edit
2018-01-30 18:20:59 +01:00
feeaa8ee8b
Better todo descr
2018-01-30 18:19:31 +01:00
1c4b8a0a67
Merge branch 'master' into notify-on-edit
2018-01-30 18:10:47 +01:00
8ad5675916
Merge branch 'master' into fix-gender
2018-01-30 12:09:06 -05:00
7a7d45cf91
Merge pull request #1326 from coralproject/fix-ie11-sideactions
...
Add IE CSS fixes
2018-01-30 12:08:58 -05:00
e77e62236c
Merge branch 'master' into fix-ie11-sideactions
2018-01-30 17:57:04 +01:00
8e142a5ecb
Merge branch 'master' into fix-gender
2018-01-30 17:56:31 +01:00
3d57122a65
Add IE CSS fixes
2018-01-30 17:56:15 +01:00
665d8c1ef0
Fix gender translation
2018-01-30 17:42:30 +01:00
bd2c4d4bfc
Merge branch 'master' into notify-on-edit
2018-01-30 17:37:15 +01:00
81e68c8ef4
Fix edited comment not showing notifications
2018-01-30 17:34:18 +01:00
cb5a41f119
Refactor
2018-01-30 17:18:09 +01:00
082287387a
Merge pull request #1321 from coralproject/username-flow-fix
...
Changed Username Moderation Flow
2018-01-30 11:14:33 -05:00
9143bd2b31
Merge branch 'master' into username-flow-fix
2018-01-30 10:31:58 -05:00
2def894237
Merge pull request #1322 from hellp/approve-reject-button-style
...
Make Approve/Reject button styles more robust for longer labels
2018-01-30 10:31:27 -05:00
7dd7f9ca54
Merge branch 'master' into approve-reject-button-style
2018-01-30 10:14:22 -05:00
b33cde03c3
Removes some weird characters
2018-01-30 15:59:02 +01:00
d80cd6f0a2
More Refactor
2018-01-30 15:49:28 +01:00
ebb85d17ce
Refactor
2018-01-30 15:13:14 +01:00
efe84f3f98
Make Approve/Reject button styles more robust for long texts.
...
For other languages than English the 'Approve' text did not fit
into the button. This commit makes the CSS a bit more flexible by
removing some very pixel-specfic styles.
2018-01-30 14:50:35 +01:00
335349963c
adjusted flow for changed usernames, e2e
2018-01-29 17:46:03 -07:00
495e3b009f
Merge branch 'master' into username-flow-fix
2018-01-29 19:21:08 -05:00
2d82f4c217
Merge pull request #1319 from coralproject/cleanup
...
User Deletion Cleanup
2018-01-29 19:20:53 -05:00
6a70077398
Merge branch 'master' into cleanup
2018-01-29 19:11:18 -05:00
d25ca0ef6f
more test criteria
2018-01-29 15:36:59 -07:00
985fc05a47
only users that have approved usernames may comment
2018-01-29 15:29:55 -07:00
73cbe4ab4b
Merge pull request #1315 from coralproject/better-change-detection
...
Better handle comment edits
2018-01-29 14:54:00 -07:00
8d656b51a0
introduced count adjusters for deleting a user
2018-01-29 13:56:09 -07:00
0a889fd1b3
More Refactoring
2018-01-29 21:26:44 +01:00
c18c43e5c8
Merge branch 'master' into better-change-detection
2018-01-29 15:01:45 -05:00
c22f8d0dc0
Merge pull request #1317 from coralproject/edit-history
...
Cleanup to Edit/Premod logic
2018-01-29 14:57:27 -05:00
0799e9d8ee
More refactor
2018-01-29 20:52:44 +01:00
9645ccb6cd
Merge branch 'master' into better-change-detection
2018-01-29 14:40:48 -05:00
be51704b1f
Merge branch 'master' into edit-history
2018-01-29 14:40:44 -05:00
7e2d414f13
Merge pull request #1312 from coralproject/zen-mode
...
Rename "single comment view" to "zen mode"
2018-01-29 14:40:03 -05:00
d2e87bcbda
Merge branch 'master' into zen-mode
2018-01-29 20:32:08 +01:00
9d168c6af8
Merge pull request #1316 from coralproject/fix-hidden-moderator-commens
...
Fix moderator comments not showing up in premod
2018-01-29 14:17:35 -05:00
3a67768c51
Merge branch 'master' into fix-hidden-moderator-commens
2018-01-29 14:09:48 -05:00
e3ccb8560b
Merge pull request #1318 from coralproject/nsp
...
Removed NSP from CI
2018-01-29 14:09:36 -05:00
c355e10453
Refactor
2018-01-29 19:21:42 +01:00
e20e55b589
removed outdated logic
2018-01-29 10:35:10 -07:00
c13ea699d9
turned off nsp on CI
2018-01-29 10:07:42 -07:00
873932b6a6
Merge branch 'master' into cleanup
2018-01-29 10:02:52 -07:00
bc42539fc4
cleanup
2018-01-29 10:02:38 -07:00
5f608e9bc6
Fix moderator comments not showing up
2018-01-29 17:40:38 +01:00
2bfa99fa1a
Remove unused proptype
2018-01-29 14:52:26 +01:00
c12fe526b8
Better detect edits
2018-01-29 14:52:09 +01:00
fc3bc0a542
Merge branch 'master' into better-change-detection
2018-01-29 14:21:02 +01:00
78019396e2
Use same created_at
2018-01-29 13:47:46 +01:00
7d31487275
Merge branch 'master' into zen-mode
2018-01-26 15:31:22 -05:00
Chi Vinh Le