Commit Graph

8775 Commits

Author SHA1 Message Date
Kim Gardner 6a70077398 Merge branch 'master' into cleanup 2018-01-29 19:11:18 -05:00
Wyatt Johnson a06f76fd4c removed events 2018-01-29 16:36:54 -07:00
Wyatt Johnson d25ca0ef6f more test criteria 2018-01-29 15:36:59 -07:00
Wyatt Johnson 985fc05a47 only users that have approved usernames may comment 2018-01-29 15:29:55 -07:00
Wyatt Johnson 73cbe4ab4b Merge pull request #1315 from coralproject/better-change-detection
Better handle comment edits
2018-01-29 14:54:00 -07:00
Wyatt Johnson 8d656b51a0 introduced count adjusters for deleting a user 2018-01-29 13:56:09 -07:00
Chi Vinh Le 0a889fd1b3 More Refactoring 2018-01-29 21:26:44 +01:00
Kim Gardner c18c43e5c8 Merge branch 'master' into better-change-detection 2018-01-29 15:01:45 -05:00
Kim Gardner c22f8d0dc0 Merge pull request #1317 from coralproject/edit-history
Cleanup to Edit/Premod logic
2018-01-29 14:57:27 -05:00
Chi Vinh Le 0799e9d8ee More refactor 2018-01-29 20:52:44 +01:00
Kim Gardner 9645ccb6cd Merge branch 'master' into better-change-detection 2018-01-29 14:40:48 -05:00
Kim Gardner be51704b1f Merge branch 'master' into edit-history 2018-01-29 14:40:44 -05:00
Kim Gardner 7e2d414f13 Merge pull request #1312 from coralproject/zen-mode
Rename "single comment view" to "zen mode"
2018-01-29 14:40:03 -05:00
Kiwi d2e87bcbda Merge branch 'master' into zen-mode 2018-01-29 20:32:08 +01:00
Kim Gardner 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
Kim Gardner 3a67768c51 Merge branch 'master' into fix-hidden-moderator-commens 2018-01-29 14:09:48 -05:00
Kim Gardner e3ccb8560b Merge pull request #1318 from coralproject/nsp
Removed NSP from CI
2018-01-29 14:09:36 -05:00
Chi Vinh Le c355e10453 Refactor 2018-01-29 19:21:42 +01:00
Wyatt Johnson e20e55b589 removed outdated logic 2018-01-29 10:35:10 -07:00
Wyatt Johnson c13ea699d9 turned off nsp on CI 2018-01-29 10:07:42 -07:00
Wyatt Johnson 873932b6a6 Merge branch 'master' into cleanup 2018-01-29 10:02:52 -07:00
Wyatt Johnson bc42539fc4 cleanup 2018-01-29 10:02:38 -07:00
Chi Vinh Le 5f608e9bc6 Fix moderator comments not showing up 2018-01-29 17:40:38 +01:00
Chi Vinh Le 2bfa99fa1a Remove unused proptype 2018-01-29 14:52:26 +01:00
Chi Vinh Le c12fe526b8 Better detect edits 2018-01-29 14:52:09 +01:00
Chi Vinh Le fc3bc0a542 Merge branch 'master' into better-change-detection 2018-01-29 14:21:02 +01:00
Chi Vinh Le 78019396e2 Use same created_at 2018-01-29 13:47:46 +01:00
Kim Gardner 7d31487275 Merge branch 'master' into zen-mode 2018-01-26 15:31:22 -05:00
Kim Gardner f5c3f7e9bc Merge pull request #1313 from coralproject/activity-dot-subscription
Port Activity dot polling to subscriptions
2018-01-26 15:31:01 -05:00
Kim Gardner 9e127d2300 Merge branch 'master' into activity-dot-subscription 2018-01-26 15:13:30 -05:00
Wyatt Johnson 172bc22af5 Merge branch 'master' into cleanup 2018-01-26 12:58:36 -07:00
Wyatt Johnson 4be9e74ed9 removed unused code 2018-01-26 12:58:16 -07:00
Wyatt Johnson f4d134d0e2 Merge pull request #1311 from coralproject/migration-updates
Migration updates
2018-01-26 12:57:08 -07:00
Wyatt Johnson 752825db68 Merge branch 'master' into migration-updates 2018-01-26 10:51:58 -07:00
Chi Vinh Le 9a36473c8f Merge branch 'activity-dot-subscription' of ssh://github.com/coralproject/talk into activity-dot-subscription 2018-01-26 17:30:16 +01:00
Chi Vinh Le 3fa2af975c Bug fixes 2018-01-26 17:28:21 +01:00
Wyatt Johnson 57a77a7edf enhanced flag migration 2018-01-25 19:21:00 -07:00
Wyatt Johnson 6caae2df97 applied migration performance improvements 2018-01-25 18:17:04 -07:00
Kiwi c00e534984 Merge branch 'master' into activity-dot-subscription 2018-01-26 01:49:04 +01:00
Chi Vinh Le b638b783fe Refactor 2018-01-26 01:42:46 +01:00
Kim Gardner de18ab1e15 Merge pull request #1310 from coralproject/plugin-cli
Plugin CLI Fix
2018-01-25 18:44:53 -05:00
Wyatt Johnson 75751285fe fixed default setup 2018-01-25 16:18:05 -07:00
Wyatt Johnson 04390c5acd migration rewrite and removed verifications 2018-01-25 16:12:26 -07:00
Chi Vinh Le ce25cfb159 Reconstruct previous comment state more accurately 2018-01-25 22:03:37 +01:00
Wyatt Johnson e8f73ddb87 changed copy 2018-01-25 13:20:16 -07:00
Wyatt Johnson e6f796e99c expanded on migration support 2018-01-25 13:07:29 -07:00
Kim Gardner 0507e750b9 Update translations 2018-01-25 15:00:34 -05:00
Kim Gardner fe4cddda60 Copy change 2018-01-25 14:51:15 -05:00
Kim Gardner 63347dc0eb Change s to z for zen mode shortcut and update copy and docs 2018-01-25 14:50:06 -05:00
Chi Vinh Le 426025f8c2 Subscribe to edited + bug fixes 2018-01-25 20:49:57 +01:00