wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-06 13:41:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,689 Commits 10 Branches 125 Tags
c9ae622ec3cbcd2de7be29a97cd7be621e45da8b
Commit Graph
1382 Commits
Author SHA1 Message Date
Belen Curcio c9ae622ec3 merge conflicts 2017-10-12 13:00:16 -03:00
Kim GardnerandGitHub 43d92e5b76 Merge branch 'master' into configure-styling-fix 2017-10-12 16:27:06 +01:00
Belen Curcio 36be112744 Keyboard accesible 2017-10-12 11:04:17 -03:00
Chi Vinh Le 3035ba0bcf Fix configure styling issues 2017-10-12 20:57:34 +07:00
Belen Curcio a7064bbfdb Adding missing proptypes and ellipsis 2017-10-12 10:29:23 -03:00
Kim GardnerandGitHub a48bfbaa69 Merge branch 'master' into dropdown 2017-10-11 09:49:19 +01:00
Chi Vinh Le 7b76450eb5 Merge branch 'master' into refactor-configure 
Conflicts:
	client/coral-admin/src/routes/Configure/components/Configure.css
	client/coral-admin/src/routes/Moderation/components/Moderation.js
 2017-10-11 14:17:36 +07:00
Kim GardnerandGitHub 4548134e3f Merge branch 'master' into dropdown 2017-10-10 18:18:34 +01:00
Belen Curcio 0d66e42313 Merge branch 'viewing-options' of github.com:coralproject/talk into viewing-options 2017-10-10 13:16:37 -03:00
Belen Curcio 154949ff47 Update 2017-10-10 13:12:55 -03:00
Belen Curcio 7fcc7753f8 Update 2017-10-10 12:50:31 -03:00
Belen Curcio f2ea269f7a Merge branch 'master' of github.com:coralproject/talk into dropdown 2017-10-10 12:26:29 -03:00
Kim GardnerandGitHub c0a54b6538 Merge branch 'master' into viewing-options 2017-10-10 13:06:18 +01:00
Chi Vinh Le 61604a7d07 Export ConfigureCard in plugin-api 2017-10-10 17:06:45 +07:00
Chi Vinh Le dfcb9e24df Refactor components 2017-10-10 17:00:25 +07:00
Belen Curcio 7b38bac525 Stories Dropdown, Proptypes and tiny refactor 2017-10-10 03:18:28 -03:00
Belen Curcio 16847f9fec Translations and PropTypes 2017-10-10 02:48:12 -03:00
Belén CurcioandGitHub 29c7c9e810 Merge branch 'master' into viewing-options 2017-10-10 00:18:03 -03:00
Chi Vinh Le 21342b8b81 Fix title styling 2017-10-09 23:56:16 +07:00
Chi Vinh Le ec436bcb39 Refactor Configure styles 2017-10-09 23:50:43 +07:00
Chi Vinh Le 59eff3e29e Refactor moderationSettings styles 2017-10-09 23:37:37 +07:00
Chi Vinh Le 574cbf8e79 Refactor TechSettings styles 2017-10-09 23:28:32 +07:00
Chi Vinh Le b3fc920919 Refactor EmbedLink styles 2017-10-09 23:26:15 +07:00
Chi Vinh Le 1d089ee151 Refactor Domainlist styles 2017-10-09 23:00:21 +07:00
Chi Vinh Le 0434ecf755 Refactor Wordlist styles 2017-10-09 22:58:58 +07:00
Tyler BrewerandGitHub 48c291a9c3 Merge branch 'master' into fix-shortcut-icon 2017-10-09 11:01:26 -04:00
Chi Vinh Le c0ff9c1beb Merge branch 'master' into refactor-configure 
Conflicts:
	client/coral-admin/src/routes/Moderation/components/Moderation.js
 2017-10-09 21:30:03 +07:00
Chi Vinh Le c52e42c644 Allow changing wordlist and domains using the updateSettings mutation 2017-10-09 16:51:27 +07:00
Gerardo Galvez e4ff48ea88 Merge branch 'moderate-shortcuts' of https://github.com/gerardogalvez/talk into moderate-shortcuts 2017-10-06 20:20:48 -05:00
Gerardo Galvez cbd7337dbc Add spanish translations and cleaner way to get the activeTabIndex 2017-10-06 20:19:30 -05:00
Chi Vinh Le 0a190a9838 Add slots 2017-10-07 01:01:14 +07:00
Chi Vinh Le 6ff2e38003 Little Optimization 2017-10-07 00:54:46 +07:00
Chi Vinh Le 3a28eae384 Move activeSection to redux 2017-10-07 00:47:50 +07:00
Chi Vinh Le 5fbabcaa1b Simplify Configure 2017-10-07 00:31:44 +07:00
Chi Vinh Le eae5b85d1a Turn ModerationSettings into container 2017-10-06 23:08:56 +07:00
Belen Curcio dbe6e675c9 Modal Keys should show on tablet 2017-10-06 13:02:18 -03:00
Chi Vinh Le 2c8366d6b7 Turn TechSettings to container 2017-10-06 22:32:02 +07:00
Chi Vinh Le ae3d1c1819 Turn StreamSettings to container 2017-10-06 22:17:51 +07:00
Belen Curcio 0f6bbb21a3 Fix drawer too 2017-10-06 11:05:38 -03:00
Belen Curcio c2cbf91cad Merge branch 'master' of github.com:coralproject/talk into viewing-options 2017-10-06 11:02:46 -03:00
Belen Curcio fe689c5888 Margin Top 2017-10-06 10:52:16 -03:00
Belen Curcio e1f5fe1f77 Responsive Ready 2017-10-06 10:50:48 -03:00
Belen Curcio 848c04539c Select working 2017-10-06 10:35:04 -03:00
Belen Curcio e4b225b4c2 ViewingOptions, Cards, Proptypes and MediaQueries 2017-10-06 10:10:08 -03:00
Chi Vinh Le 5073ef6c1b Implement save settings 2017-10-06 18:27:10 +07:00
tylerbrewer2 a4591ecb55 fix hidden shortcut icon 2017-10-05 20:51:54 -04:00
Gerardo GálvezandGitHub 931b5ad3ac Merge branch 'master' into moderate-shortcuts 2017-10-05 17:18:18 -05:00
Gerardo Galvez c0bb5e5cb2 Add moderator shortcuts to open search and switch between queues. 2017-10-05 16:57:46 -05:00
Chi Vinh Le 9c00050f6a Load settings from graph 2017-10-05 21:05:05 +07:00
Belen Curcio 886df1cdca Now every section is full width :D 2017-10-05 08:21:17 -03:00