Commit Graph

2047 Commits

Author SHA1 Message Date
gaba 0f074dc034 Changes styles for Emma and Sam's design. 2017-02-14 17:13:08 -08:00
gaba d3f81353a6 Fix TextField for coral-ui and setting configure stream, question box. 2017-02-14 16:51:57 -08:00
gaba 52a1ebe82a Merge branch 'master' into sory-139595043-qbox 2017-02-14 15:35:43 -08:00
gaba b1d90dfd87 Fix TextField for the Configure Stream. 2017-02-14 15:31:12 -08:00
David Erwin d4651d4a2f Merge pull request #312 from coralproject/disable-e2e-ci
Comment out e2e in ci
2017-02-14 17:01:46 -05:00
David Erwin 06422d7074 Comment out e2e in ci 2017-02-14 16:56:55 -05:00
David Erwin b76f3bbf91 Merge branch 'all-flag'
t push origin master
2017-02-14 16:31:01 -05:00
Belén Curcio 023ba74c8f Merge branch 'master' into all-flag 2017-02-14 16:34:44 -03:00
Belen Curcio 41a1eeda26 Removing all code 2017-02-14 16:10:08 -03:00
Belen Curcio bbb82b6a77 New static routes <3 for global and single assets, also, deprecating the all view 2017-02-14 16:06:13 -03:00
David Erwin daec809d87 Merge pull request #307 from coralproject/external-css-file
Configure override css file
2017-02-14 13:58:05 -05:00
David Erwin ce2213549b Merge branch 'master' into external-css-file 2017-02-14 13:40:22 -05:00
David Erwin d2c9b4b7a7 Merge pull request #310 from coralproject/close-time-bug
fix Configure in admin
2017-02-14 13:40:07 -05:00
Riley Davis 53e3147290 properly save settings to server 2017-02-14 11:29:40 -07:00
Riley Davis fe1aaba9ed revert state shape to what it was before 2017-02-14 11:05:39 -07:00
gaba f51c857e8b Merge branch 'master' into sory-139595043-qbox 2017-02-14 08:51:58 -08:00
David Erwin d1749e0f35 Merge branch 'master' into external-css-file 2017-02-14 09:59:37 -05:00
David Erwin b85950140b Merge pull request #309 from coralproject/install-missing
Missing reducer in Talk Installer
2017-02-14 09:59:16 -05:00
Belen Curcio f07900b294 Missing reducer 2017-02-14 11:44:22 -03:00
gaba d4109c8fca Adds textfield to coral-UI. 2017-02-13 16:51:31 -08:00
Riley Davis 86d0e59147 add translation to input label 2017-02-13 16:09:06 -07:00
Riley Davis 183d2e1ea0 Merged branch master into external-css-file 2017-02-13 16:04:00 -07:00
Riley Davis 0234112ad0 enable configuration for linking override stylesheets 2017-02-13 16:03:49 -07:00
David Erwin 586d3c4c8a Merge pull request #304 from coralproject/mod-queues-ql
Moderation Queue
2017-02-13 17:40:26 -05:00
Wyatt Johnson 51cbf79f30 Changed fragment 2017-02-13 15:33:10 -07:00
gaba 1d70ae0dec Adds question enable checkbox. 2017-02-13 14:31:56 -08:00
Belen Curcio 8953182329 merge 2017-02-13 19:14:27 -03:00
gaba f9f32b1ef6 Merge branch 'master' into sory-139595043-qbox 2017-02-13 14:13:28 -08:00
gaba 1b788b98c6 Adds questionBox to the gl query 2017-02-13 14:12:32 -08:00
Belen Curcio 51be47b62e added flag functionality 2017-02-13 19:09:26 -03:00
David Erwin b30ace74b4 Merge pull request #299 from coralproject/username-displayname
Inital rename of displayName -> username
2017-02-13 17:07:56 -05:00
gaba 5a2e4b708b Adds question box 2017-02-13 13:48:03 -08:00
Belen Curcio 37ba14f3b5 breaking big words 2017-02-13 18:27:26 -03:00
Belen Curcio 519298b980 Design Pass 2017-02-13 18:12:37 -03:00
gaba b16bdafc1a Adds plugin for question box. 2017-02-13 12:22:05 -08:00
Belen Curcio 732ef9b8bd Adding moderationList for the tests 2017-02-13 16:24:12 -03:00
Belen Curcio 72156a01b8 Merge branch 'mod-queues-ql' of github.com:coralproject/talk into mod-queues-ql 2017-02-13 16:14:48 -03:00
Belen Curcio 0403c46c6c Adding errors response 2017-02-13 16:13:03 -03:00
Belen Curcio 594b87208a GraphQL Review and Responses 2017-02-13 16:00:55 -03:00
Belén Curcio 12acbeee45 Merge branch 'master' into mod-queues-ql 2017-02-13 15:23:43 -03:00
Wyatt Johnson e494cbd7e8 Merge branch 'master' into username-displayname 2017-02-13 11:17:29 -07:00
Riley Davis e178b2e82a Merge pull request #305 from coralproject/date-spacing
add a non-breaking space in between username and pubdate
2017-02-13 11:08:58 -07:00
riley ba51b0742f remove non-breaking space and add css 2017-02-13 11:00:28 -07:00
Riley Davis 5a0af59c45 add a non-breaking space in between username and pubdate 2017-02-13 10:53:03 -07:00
Wyatt Johnson b30a5d2184 Removed 3.4 dep 2017-02-13 10:49:47 -07:00
Belen Curcio e2ebac7176 adds new mutations: setCommentStatus 2017-02-13 14:32:48 -03:00
Wyatt Johnson 4e73d7fc23 Switched from Circle 2.0 -> 1.0, added set -e 2017-02-13 10:23:11 -07:00
Wyatt Johnson a2855a7343 Removed unused shell 2017-02-13 10:03:55 -07:00
Belen Curcio 90ed1f1056 Ban user with graphql, 100 refactor 2017-02-13 11:50:16 -03:00
Wyatt Johnson af49b0f6fb Fixed checkout order 2017-02-10 16:29:29 -07:00