Commit Graph

8624 Commits

Author SHA1 Message Date
okbel dcddfa4f39 Adding fragments to the slot 2018-03-05 14:46:09 -03:00
okbel 59da1ec1af Merge branch 'rte-plugin' of github.com:coralproject/talk into rte-plugin
* 'rte-plugin' of github.com:coralproject/talk:
  Fix file name casing
2018-03-05 14:41:15 -03:00
okbel 284598439d adding slot userDetailCommentContent 2018-03-05 14:40:51 -03:00
okbel 95da5697fc Adding styles 2018-03-05 14:29:19 -03:00
okbel 7962df6983 adding br to the purifier 2018-03-05 14:14:22 -03:00
Chi Vinh Le a1f6800d99 Fix file name casing 2018-03-05 17:45:56 +01:00
okbel 515867bf14 quotes styling 2018-03-05 13:00:29 -03:00
okbel 87ea7b5dae Merge issues 2018-03-05 12:56:36 -03:00
okbel 1d31099c9d Passing down root data 2018-03-05 08:49:59 -03:00
okbel 5f5bc631b6 Merge branch 'master' of github.com:coralproject/talk into rte-plugin
* 'master' of github.com:coralproject/talk: (103 commits)
  Implement new permlink view for real
  fixes to ci for deploy
  fixed deploy
  changed max retries on unreliable tests
  always save test results
  fixed workspace error
  implemented staff replies
  adjusted client tests
  seperated tests
  more fixes to translation
  fixed translation
  review
  object propery typo
  added safari to integration jobs
  added develop filter
  added deeper cache support
  added dist cache support
  fixed firefox support
  removed headless
  ammended browserstack test
  ...
2018-03-02 12:30:22 -03:00
Kim Gardner 8d147dbf47 Merge pull request #1406 from coralproject/permalink-enh
Permalink 2
2018-03-01 18:19:54 -05:00
Chi Vinh Le 91dd9b157a Implement new permlink view for real 2018-03-02 00:00:51 +01:00
okbel 11b98370b6 hook handler 2018-03-01 19:59:02 -03:00
okbel bc273d16f7 hook to clear text after submiting a comment 2018-03-01 19:43:54 -03:00
Kim Gardner 98b517affb Merge branch 'master' into permalink-enh 2018-03-01 17:00:41 -05:00
okbel 8192a3bfc4 CommentContent added to the admin side 2018-03-01 18:38:14 -03:00
Wyatt Johnson 58269a7cae Merge pull request #1412 from coralproject/ci-fixes
CI Fixes
2018-03-01 12:52:52 -07:00
okbel 0055c82166 Passing the comment down until we reach the queryData 2018-03-01 16:47:15 -03:00
Wyatt Johnson 5f9c6b3b88 fixes to ci for deploy 2018-03-01 12:46:11 -07:00
okbel e055a3e4d4 Adding rootquery support 2018-03-01 16:39:58 -03:00
Kiwi 57d7920c59 Merge branch 'master' into permalink-enh 2018-03-01 20:13:04 +01:00
Kim Gardner cc9b030fb3 Merge pull request #1410 from coralproject/staff-notifications
Staff Reply Notifications
2018-03-01 14:10:19 -05:00
Wyatt Johnson da6ac290aa Merge branch 'master' into staff-notifications 2018-03-01 11:51:44 -07:00
Kiwi 3610e96c74 Merge pull request #1409 from coralproject/featured-notifications
Featured Notifications
2018-03-01 19:45:52 +01:00
okbel 300e518c2d Rolling back classes 2018-03-01 14:39:25 -03:00
okbel eaf403353f Grab rootQuery too! 2018-03-01 14:16:15 -03:00
okbel d1c0167e9a Simpler fragments 2018-03-01 14:12:07 -03:00
okbel 3fd1d6705d fragment added 2018-03-01 11:56:35 -03:00
okbel de69cf5790 wip changes 2018-03-01 11:27:21 -03:00
okbel a3158a494c Changes added 2018-03-01 10:29:03 -03:00
Wyatt Johnson 8cb75e3bb1 fixed deploy 2018-02-28 17:31:52 -07:00
Wyatt Johnson de54b916ef changed max retries on unreliable tests 2018-02-28 17:22:53 -07:00
Wyatt Johnson 6426d3ebd8 always save test results 2018-02-28 17:22:53 -07:00
Wyatt Johnson 9be6a3cce6 Merge branch 'master' into featured-notifications 2018-02-28 16:12:53 -07:00
Wyatt Johnson 288768793a Merge pull request #1411 from coralproject/reconcile-fix
Reconcile Fix
2018-02-28 16:12:34 -07:00
Wyatt Johnson bd93d2d5b5 fixed workspace error 2018-02-28 15:54:26 -07:00
Wyatt Johnson 6b54957760 Merge branch 'master' into featured-notifications 2018-02-28 15:30:47 -07:00
Wyatt Johnson 5afa4fa269 implemented staff replies 2018-02-28 15:30:18 -07:00
okbel ba685a05a2 the fragment tree 2018-02-28 18:48:12 -03:00
Kim Gardner 4304cad787 Merge pull request #1408 from coralproject/plugins-debug
Fixes for the plugin config and plugins debug
2018-02-28 16:34:01 -05:00
Kim Gardner d969da540f Merge branch 'master' into plugins-debug 2018-02-28 16:29:04 -05:00
okbel 20c29cd81c removing slot name change 2018-02-28 18:22:15 -03:00
okbel 72e80a4693 changes 2018-02-28 18:16:32 -03:00
Wyatt Johnson 80818b0861 Merge branch 'master' into permalink-enh 2018-02-28 14:10:12 -07:00
okbel 20bec20437 changes 2018-02-28 18:07:28 -03:00
Wyatt Johnson 2451d4b6d6 adjusted client tests 2018-02-28 14:00:56 -07:00
Wyatt Johnson 744348dee5 seperated tests 2018-02-28 13:50:36 -07:00
Wyatt Johnson d2fafafb84 Merge branch 'master' into featured-notifications 2018-02-28 13:26:58 -07:00
Wyatt Johnson 1a7f7dddd4 more fixes to translation 2018-02-28 13:26:35 -07:00
Wyatt Johnson 7ccb1e26a4 fixed translation 2018-02-28 13:26:08 -07:00