Commit Graph
1731 Commits
Author SHA1 Message Date
KiwiandGitHub 82280a7da7 Merge branch 'master' into better-graph 2018-03-15 17:49:31 +01:00
Wyatt Johnson 8c7e8080c3 added translations 2018-03-14 15:13:44 -06:00
Wyatt Johnson bb1b265cae lint 2018-03-14 15:12:38 -06:00
Chi Vinh Le a81ae2b7f8 Remove data prop from Slots 2018-03-13 21:06:32 +01:00
Olly DuttonandGitHub 6efda40e29 Update Comment.js
fix linting error
2018-03-13 15:34:28 +11:00
Olly DuttonandGitHub 8e0c53ef3b Update UserDetailComment.js
fix linting error
2018-03-13 15:33:46 +11:00
Olly DuttonandGitHub bfb9ea1eea Update Comment.js
Ternary to display asset url if there's no asset title in admin comments
2018-03-13 12:18:21 +11:00
Olly DuttonandGitHub 93e850ba3f Update UserDetailComment.js
Ternary to display asset url if there's no asset title in admin comments
2018-03-13 12:16:59 +11:00
Chi Vinh Le cd638e7f85 Merge branch 'master' into refactor-graph 2018-03-09 19:27:35 +01:00
Chi Vinh Le 0397906907 Port coral-admin to new passthrough prop 2018-03-09 19:15:33 +01:00
Chi Vinh Le e0dc871367 Rename slotSize to size 2018-03-09 14:50:34 +01:00
Chi Vinh Le e6b28a55af Display digest settings 2018-03-07 14:38:53 +01:00
Chi Vinh Le 090920131f Attach root fragment 2018-03-05 22:24:35 +01:00
okbel be62a2780c normalized blockquote 2018-03-05 14:48:32 -03:00
okbel 0f58c1b780 Adding fragments to the slot 2018-03-05 14:46:47 -03:00
okbel dcddfa4f39 Adding fragments to the slot 2018-03-05 14:46:09 -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 515867bf14 quotes styling 2018-03-05 13:00:29 -03:00
okbel 8192a3bfc4 CommentContent added to the admin side 2018-03-01 18:38:14 -03:00
okbel d1c0167e9a Simpler fragments 2018-03-01 14:12:07 -03:00
Wyatt Johnson 8b4fe46120 added support for new system icon 2018-02-23 12:32:49 -07:00
Wyatt Johnson 139d036b42 changed styles + added translations 2018-02-22 17:32:37 -07:00
Kim GardnerandGitHub 34922a6d42 Merge branch 'master' into account-h-until 2018-02-20 10:56:40 -05:00
Kim Gardner 233c514251 Fix small typo 2018-02-20 10:37:36 -05:00
okbel 846df0a5e0 trim dates, style tooltip 2018-02-19 12:27:55 -03:00
okbel e7934d9468 trim dates, style tooltip 2018-02-19 12:23:36 -03:00
okbel 12497a1331 Adding duration asHours and asDays 2018-02-19 12:07:57 -03:00
Wyatt Johnson 4bb2b3d731 fixes to spam plugin 2018-02-16 14:34:04 -07:00
Chi Vinh Le ba11eb233a Fix proptypes errors in auth 2018-02-16 12:31:37 +01:00
Chi Vinh Le 43e02e1574 Apply suggestions 2018-02-14 14:59:00 +01:00
Chi Vinh Le c7ee8307e6 Merge branch 'master' into auth-refactor 2018-02-13 16:33:17 +01:00
Chi Vinh Le 4b6a3b5b9d More refactoring 2018-02-09 23:18:21 +01:00
Chi Vinh Le f4fc8915e3 Refactor talk-plugin-auth part 1 2018-02-09 20:12:02 +01:00
Kim GardnerandGitHub 22467ac123 Merge branch 'master' into admin-user-details 2018-02-08 11:26:11 -05:00
Chi Vinh Le d526a404ae Finish admin auth refactor 2018-02-07 22:17:52 +01:00
Chi Vinh Le aaad7aa86f Reimplement recaptcha 2018-02-07 22:10:05 +01:00
Chi Vinh Le ffbcd93c3f Adapt to master changes 2018-02-07 19:04:35 +01:00
Chi Vinh Le 61bc372640 Merge branch 'master' into auth-refactor 2018-02-07 18:42:26 +01:00
Chi Vinh Le ee3d576a49 Auth Refactor part 2 2018-02-07 18:42:03 +01:00
Wyatt JohnsonandGitHub 3c04e6c7ec Merge branch 'master' into patch-1 2018-02-07 10:40:14 -07:00
Wyatt JohnsonandGitHub 77723e3fb3 Merge branch 'master' into patch-2 2018-02-07 10:32:34 -07:00
Leandro bba14f502a Merge branch 'admin-user-details' of https://github.com/leeeandroo/talk into admin-user-details 2018-02-07 09:14:28 +01:00
Leandro 44913864eb remove identification changes on UserDetails 2018-02-07 09:12:39 +01:00
Matt MontgomeryandGitHub 3c66401546 Providers username for subscription fields 2018-02-06 16:29:25 -07:00
Chi Vinh Le f8e0556904 Auth Refactor part 1 2018-02-06 20:30:31 +01:00
Kim GardnerandGitHub a5c08129ce Merge branch 'master' into admin-user-details 2018-02-06 14:20:26 -05:00
Kim GardnerandGitHub 7c859ad4c3 Merge branch 'master' into patch-2 2018-02-06 14:20:00 -05:00
Kim GardnerandGitHub b9cfddc5c0 Merge branch 'master' into keep-drafts 2018-02-06 14:06:57 -05:00
Kim GardnerandGitHub caa588f11d Merge branch 'master' into keep-drafts 2018-02-06 11:36:31 -05:00