Commit Graph

439 Commits

Author SHA1 Message Date
gaba ff2c3cf30b Hide the textfield when not enable. 2016-11-15 20:31:24 -08:00
gaba 621550e261 Null, not empty string. 2016-11-15 15:31:54 -08:00
gaba 3abc0692bb At the top, not the bottom. 2016-11-15 15:31:12 -08:00
gaba 4137758bfd Merge branch 'master' into comment-box 2016-11-15 15:21:08 -08:00
gaba d24c7c0bc2 Struggling with hiding elements. 2016-11-15 15:18:17 -08:00
gaba 399ba72e0e It changes translations to json file. It adds infobox setting. 2016-11-15 15:15:41 -08:00
Gabriela Rodríguez Berón 0bfa68e699 Merge pull request #67 from coralproject/webpack-fix
Added fix for webpack building
2016-11-15 12:44:21 -08:00
Wyatt Johnson 721c041332 Added fix for webpack building 2016-11-15 13:33:02 -07:00
Riley Davis bada782b28 Merge pull request #63 from coralproject/like-button
Like button
2016-11-15 13:09:28 -07:00
David Jay d1ea85468e Addressing issue when deleting actions. 2016-11-15 14:46:08 -05:00
David Jay a886123c62 Merge branch 'like-button' of https://github.com/coralproject/talk into like-button 2016-11-15 14:39:58 -05:00
David Jay fbf27a9d75 Resolving 500 error when deleting an action. 2016-11-15 14:24:38 -05:00
Riley Davis 7ecd60fbf7 Merge branch 'master' into like-button 2016-11-15 12:15:13 -07:00
Riley Davis 688f3c1cb7 Merge pull request #65 from coralproject/add/change-role
feature(coral-admin): Add users role change
2016-11-15 12:00:40 -07: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
Belen Curcio 366e072280 Linting Issues 2016-11-14 23:35:33 -03:00
David Jay 44292a81ad Moving init and responsehandler to shared functions, updating all routes to return valid JSON. 2016-11-14 17:09:20 -05:00
Dan Zajdband e53ac55e6b Linting 2016-11-14 17:03:31 -05:00
Dan Zajdband 9c41adf224 Added enum check for the user model 2016-11-14 16:44:21 -05:00
Dan Zajdband 223887616d feature(coral-admin): Add users role change 2016-11-14 16:20:56 -05:00
David Jay 6fa40c3f9b Adding model tests for assets. 2016-11-14 15:11:25 -05:00
David Jay 494b7d808b Addressing lint error. 2016-11-14 13:02:08 -05:00
David Jay 8abec63620 Merge branch 'master' of https://github.com/coralproject/talk into like-button 2016-11-11 19:20:37 -05:00
David Jay b629cf359f Removing likes and flags on second click. 2016-11-11 19:07:15 -05:00
David Jay 4bea5e5914 Adding route to delete actions. 2016-11-11 17:06:29 -05:00
David Erwin 9897135035 Merge pull request #59 from coralproject/moving-to-queue
Moved the moderation queue to its own folder and change the route to …
2016-11-11 16:50:05 -05:00
David Jay 92869e529a Fixing comment count bug. 2016-11-11 16:27:56 -05:00
David Jay 1adac5cde1 Adding like button. 2016-11-11 16:25:47 -05:00
gaba 879b32cf9e Merge branch 'master' into moving-to-queue 2016-11-11 13:01:48 -08:00
gaba c6198b21bc It changes the endpoint for the moderation queue. 2016-11-11 12:59:24 -08:00
Gabriela Rodríguez Berón fad0122960 Merge pull request #62 from coralproject/permalinks-v2
first pass at permalink box
2016-11-11 12:41:52 -08:00
Riley Davis 2c6d321c7f Merged branch permalinks-v2 into permalinks-v2 2016-11-11 13:25:56 -07:00
Riley Davis add200fe38 rename translations file to json 2016-11-11 13:25:46 -07:00
Riley Davis f0027220ce Merge branch 'master' into permalinks-v2 2016-11-11 13:18:30 -07:00
gaba 51b497e991 Merge branch 'master' into moving-to-queue 2016-11-11 12:17:56 -08:00
Riley Davis 4b6bf58d43 now with translations and page hostname 2016-11-11 13:17:18 -07:00
Gabriela Rodríguez Berón 5408799ffd Merge pull request #61 from coralproject/i18n
I18n
2016-11-11 10:54:06 -08:00
David Jay a16959b432 Merge branch 'i18n' of https://github.com/coralproject/talk into i18n 2016-11-11 13:49:48 -05:00
David Jay ba43e9d6dd Adding translations for comment post notifications. 2016-11-11 13:46:35 -05:00
Riley Davis 8369f09bda Merge branch 'master' into permalinks-v2 2016-11-11 11:45:42 -07:00
Riley Davis e2735759a6 first pass at permalink box 2016-11-11 11:27:39 -07:00
gaba aeefa89e0a Fix spanish translations. 2016-11-11 09:22:05 -08:00
David Jay 9174b0fcda Merge branch 'master' of https://github.com/coralproject/talk into i18n 2016-11-11 11:45:27 -05:00
David Jay 309f53b359 Adding notifcation translations. 2016-11-11 11:44:50 -05:00
gaba ad01bc813f Removes script and change according to suggestion. 2016-11-11 08:38:51 -08:00
David Erwin 35ef4af1ac Merge pull request #57 from coralproject/load-settings
Load settings in front end
2016-11-11 11:28:37 -05:00