151 Commits

Author	SHA1	Message	Date
Kim Gardner	ce4ab4e86c	Merge branch 'master' into next	2018-01-04 17:28:13 -05:00
Kim Gardner	bf1fbfe03f	Fix merge conflicts on master	2018-01-04 16:43:51 -05:00
MEL27	ae0407ed5e	Refine zh_CN translation	2017-12-26 12:08:47 +08:00
MEL27	a5d7bca8c0	Refine zh_CN translation	2017-12-26 00:20:58 +08:00
MEL27	8a40093399	Refine zh_CN translation	2017-12-25 22:22:46 +08:00
MEL27	b3d76bba05	Miscellaneous zh_CN translation changes	2017-12-25 17:45:03 +08:00
MEL27	5f0f97edbb	Refine locales/zh_CN.yml	2017-12-24 16:55:10 +08:00
MEL27	19c46d3b32	Refine Simplified Chinese translation	2017-12-24 12:51:19 +08:00
MEL27	5b356e6249	Add initial Simplified Chinese translation	2017-12-24 12:22:44 +08:00
okbel	570c0edfb3	merge conficts	2017-12-20 16:06:55 -03:00
Kim Gardner	3ea141d4b0	Merge branch 'master' into i18n-serverside-plugins	2017-12-18 16:44:23 -06:00
Kim Gardner	82fd56dc67	Update permalink copy to Share on stream	2017-12-18 13:09:39 -05:00
Wyatt Johnson	fdd5cbb0d7	moved email contents to translation files	2017-12-14 16:56:24 -06:00
Wyatt Johnson	2d70caf03d	Merge branch 'next' into user-status-refactor	2017-12-04 15:42:57 -07:00
Wyatt Johnson	419784f6d1	Merge branch 'master' into next	2017-12-04 15:28:41 -07:00
Kim Gardner	64276cd157	Remove Dashboard	2017-11-30 23:20:01 +00:00
Belen Curcio	c177403628	Merge branch 'user-status-refactor' of github.com:coralproject/talk into user-status-refactor	2017-11-28 14:37:50 -03:00
Belen Curcio	b7704fb2ca	Translations and Styling	2017-11-28 14:37:23 -03:00
Wyatt Johnson	2437401daf	Merge branch 'next' into user-status-refactor	2017-11-28 09:47:34 -07:00
Wyatt Johnson	7f189cd4d4	Merge branch 'master' into next	2017-11-28 09:47:21 -07:00
Belen Curcio	16e3924d3f	Ban user dialog steps	2017-11-28 13:39:49 -03:00
Belen Curcio	d510905ba2	Adding ban message and setRole	2017-11-28 00:18:09 -03:00
Kim Gardner	12e61bbc66	Update suspend copy	2017-11-20 19:41:14 +00:00
Wyatt Johnson	c98c9b3369	Merge branch 'master' into next	2017-11-17 09:29:31 -07:00
Chi Vinh Le	5073e60df5	Translate	2017-11-14 14:05:30 +01:00
Chi Vinh Le	5a71db2568	Undo to previous status + Live updates	2017-11-14 13:58:18 +01:00
Wyatt Johnson	61df0e1eeb	Merge branch 'master' into next	2017-11-08 13:49:21 -07:00
blackcathacker	903e70d641	updates per review	2017-10-31 17:10:25 -07:00
blackcathacker	07e6c15c3a	add numbered shortcuts for mod queue	2017-10-30 23:08:33 -07:00
Chi Vinh Le	d75ae3aca8	Revive resend verification feature	2017-10-23 18:46:41 +02:00
Belen Curcio	7494752019	Translations, Proptypes, NoComments Component	2017-10-19 11:20:09 -03:00
Belén Curcio	7fd09c3534	Merge branch 'master' into dropdown	2017-10-13 07:59:17 -03:00
Wyatt Johnson	5e74a044f3	Merge branch 'master' into cannot-ignore-staff	2017-10-12 15:38:18 -06:00
Belen Curcio	c98cb02a4a	Adding dropdown to ViewOptions	2017-10-12 13:52:17 -03:00
Belen Curcio	c9ae622ec3	merge conflicts	2017-10-12 13:00:16 -03:00
Kim Gardner	f035a9d1e9	Flagged Usernames --> Reported Usernames	2017-10-12 13:05:13 +01:00
Kim Gardner	a48bfbaa69	Merge branch 'master' into dropdown	2017-10-11 09:49:19 +01:00
Kim Gardner	dcfdec4df1	Merge branch 'master' into cannot-ignore-staff	2017-10-11 09:49:06 +01:00
Wyatt Johnson	29d7494385	fixed more yaml issues, added lint step	2017-10-10 14:04:37 -06:00
Kim Gardner	bd7dfdbe55	Fix yml indentation	2017-10-10 18:52:53 +01:00
Wyatt Johnson	91931b2e6f	Merge branch 'master' into flags-locales	2017-10-10 11:22:59 -06:00
Wyatt Johnson	cab94842aa	small naming change	2017-10-10 11:22:19 -06:00
Wyatt Johnson	86c3c286ee	Graph fixes and migrations ... - Added migrations for mapping old keys - Added migration for fixing old dont agree flags - Removed enum requirement for output	2017-10-10 11:22:19 -06:00
Kim Gardner	d11ac54e1d	Merge branch 'master' into cannot-ignore-staff	2017-10-10 18:19:11 +01:00
Kim Gardner	e40a30d200	Fixes and cleanup	2017-10-10 17:17:04 +01:00
Kim Gardner	33e25403e7	Rename file to da.yml	2017-10-10 17:04:27 +01:00
Belen Curcio	f2ea269f7a	Merge branch 'master' of github.com:coralproject/talk into dropdown	2017-10-10 12:26:29 -03:00
Kim Gardner	b77c330823	Update i18n code	2017-10-10 14:02:07 +01:00
Kim Gardner	69ace56172	Merge branch 'master' into Danish-Translation	2017-10-10 13:08:44 +01:00
Kim Gardner	d6e7bb0a0a	Merge branch 'master' into flags-locales	2017-10-10 13:08:19 +01:00