Commit Graph
98 Commits
Author SHA1 Message Date
gaba abedb36791 Merge branch 'master' into ban-user 2016-11-28 16:04:15 -08:00
Riley Davis d5ff0f8f28 keep it DRY. add getInit all over the place. update tests 2016-11-28 16:18:19 -07:00
gaba 144e716db9 Merge branch 'master' into ban-user 2016-11-28 13:00:56 -08:00
Gabriela Rodríguez BerónandGitHub 31b0453e82 Merge branch 'master' into logout 2016-11-28 12:33:42 -08:00
gaba 6974f30c73 Merge branch 'master' into ban-user 2016-11-28 12:11:46 -08:00
Riley Davis 25d53116f7 remove unused var 2016-11-28 12:49:29 -07:00
Riley Davis 0d7014f77a add helpers to talk-adapter 2016-11-28 11:50:25 -07:00
Riley Davis ee0e0ea9ed import belen's fetch helpers 2016-11-28 11:17:41 -07:00
Belen Curcio 3ebdca33f3 Logout func 2016-11-27 19:37:17 -03:00
gaba e9fdb2cc00 Merge branch 'issue-89' into ban-user 2016-11-22 17:20:53 -08:00
gaba e5c02c4274 The field is action_type and not action. 2016-11-22 17:14:24 -08:00
gaba a192c08496 Merge branch 'master' into ban-user 2016-11-22 14:53:13 -08:00
gaba 822e13914a Fix changeStatus 2016-11-22 14:52:43 -08:00
David JayandGitHub 0d4a029529 Merge pull request #87 from coralproject/add-https-to-script
Adds https and accessibility to embed code.
2016-11-22 16:13:53 -05:00
David Jay d04812fd36 Adding https and accessability to embed code. 2016-11-22 16:09:36 -05:00
gaba 1eb2d04136 Icon was missing 2016-11-22 12:35:43 -08:00
gaba 7dc7df2601 Merge branch 'master' into ban-user 2016-11-22 09:30:52 -08:00
Wyatt Johnson 8eacb01484 Added fixes for prod 2016-11-22 09:31:54 -07:00
Wyatt JohnsonandGitHub 00a8c59c96 Merge branch 'master' into admin 2016-11-22 08:31:21 -07:00
Belen Curcio 8108ca09ef Permissions, views and somestyling 2016-11-22 11:04:56 -03:00
Belen Curcio c8d7585e90 Added FabButton to CoralUI 2016-11-22 09:34:46 -03:00
Belen Curcio 6e6681a553 Styles and refactor errors 2016-11-22 09:08:08 -03:00
Belen Curcio f7daa35c41 Active Routes 2016-11-22 08:32:26 -03:00
Bel b74a1bece3 Link Routes 2016-11-22 08:10:46 -03:00
gaba 0a8ab759b5 Move into setStatus and other actions when banned and unbanned. 2016-11-21 17:01:36 -08:00
Bel fa190b4b3e CoralLogo added to Coral-UI as SVG. and Admin session 2016-11-21 18:30:12 -03:00
gaba 3337e95a6c Move the change status of the user to a ban the user func. 2016-11-21 12:18:19 -08:00
Wyatt Johnson 3abd6cabac Merge branch 'master' into wordlist 2016-11-21 12:44:08 -07:00
Wyatt Johnson 7cc311bd81 Added wordlist, cleaned comments api 2016-11-21 11:18:52 -07:00
gaba 2b3da02cb7 Merge branch 'master' into ban-user 2016-11-18 20:41:49 -08:00
gaba 225592d7b5 Modify the action for status update. 2016-11-18 20:39:11 -08:00
gaba 7c960e7118 Add ban action. 2016-11-18 13:22:54 -08:00
Dan Zajdband 0f7d758336 fix(coral-admin): Linted code 2016-11-18 15:12:59 -05:00
gaba 0f5c0d7ce2 Adding the ban action to the moderation queue. 2016-11-18 11:14:53 -08:00
gaba e2813d2cc7 Missing SET_STATUS 2016-11-18 10:21:03 -08:00
gaba 2f6e0b04d6 Adds status to the user. 2016-11-18 09:29:14 -08:00
Dan Zajdband ee9dc7260f add(coral-admin): Added cointains link warning 2016-11-18 12:15:53 -05:00
Dan Zajdband 1134e3bc09 add(coral-admin): Syntax highlighting on links 2016-11-18 10:46:09 -05:00
gaba 81f770fb05 Merge branch 'passport' into ban-user 2016-11-17 11:55:20 -08:00
gaba 8e50c582f1 Diagrams for moderation flow. 2016-11-17 10:32:18 -08:00
Belen Curcio a8f28f64b7 Merge Issues 2016-11-17 11:00:35 -03:00
gaba 7968839826 It adds translations for the admin and fix CSS. 2016-11-16 03:07:27 -08:00
gaba ff2c3cf30b Hide the textfield when not enable. 2016-11-15 20:31:24 -08:00
gaba 4137758bfd Merge branch 'master' into comment-box 2016-11-15 15:21:08 -08:00
gaba 399ba72e0e It changes translations to json file. It adds infobox setting. 2016-11-15 15:15:41 -08:00
Dan Zajdband a0accfd993 Fixed infoBoxEnabled name 2016-11-15 13:26:39 -05:00
gaba 08d672ed46 Changes model and add admin. 2016-11-15 10:11:37 -08:00
Dan Zajdband 2438161ad9 Removed extra return 2016-11-15 12:54:25 -05:00
Dan Zajdband 1bd816dab3 Merged conflicts 2016-11-15 12:40:48 -05:00
Dan Zajdband 27261cc515 Added fix for returning a new array 2016-11-15 12:37:05 -05:00