Commit Graph

3544 Commits

Author SHA1 Message Date
gaba 2f6e0b04d6 Adds status to the user. 2016-11-18 09:29:14 -08:00
David Jay da07b737b2 Allowing commentstream to be rendered outside of embed. 2016-11-18 12:19:58 -05:00
Dan Zajdband ee9dc7260f add(coral-admin): Added cointains link warning 2016-11-18 12:15:53 -05:00
David Jay 95cd83c09e Merge branch 'master' of https://github.com/coralproject/talk into notification-room 2016-11-18 11:55:47 -05:00
David Jay b14bd02de6 Addressing style bug in FlagButton. 2016-11-18 11:51:08 -05:00
David Jay 53fa63b269 Fixing bug where reply buttons in replies to not operate as expected. 2016-11-18 11:30:38 -05:00
Dan Zajdband 1134e3bc09 add(coral-admin): Syntax highlighting on links 2016-11-18 10:46:09 -05:00
Belen Curcio 6e75b03d6b Empty states, validation and removing availability 2016-11-18 07:41:46 -03:00
Belen Curcio b1824cdc01 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-18 06:08:23 -03:00
David Jay 243c36a306 Switching Permalink props on replies to avoid null errors. 2016-11-17 17:45:44 -05:00
gaba 81f770fb05 Merge branch 'passport' into ban-user 2016-11-17 11:55:20 -08:00
David Jay c7d2a9a94f Adding padding for notifications at the bottom of the comment stream. 2016-11-17 14:52:08 -05:00
Belen Curcio 6f02450c94 Changes and translations 2016-11-17 16:21:13 -03:00
gaba 8e50c582f1 Diagrams for moderation flow. 2016-11-17 10:32:18 -08:00
Belen Curcio 21f83c6f9a Removing add Name 2016-11-17 11:54:15 -03:00
Belen Curcio a2dd08fc98 Forgot Password endpoint 2016-11-17 11:43:10 -03:00
Belen Curcio c967587b95 Pym and Iframe support embed 2016-11-17 11:40:11 -03:00
Belen Curcio 032de329a6 Linting 2016-11-17 11:19:56 -03:00
Belen Curcio a8f28f64b7 Merge Issues 2016-11-17 11:00:35 -03:00
Belen Curcio f1320c7f04 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-17 10:54:16 -03:00
Belen Curcio 19ede0ff89 Success Button SVG and Redirect to signIn 2016-11-17 10:39:51 -03:00
Belen Curcio 9f13357d25 Ádding Debouncing for CheckAvailability, Valid Check form and Styling 2016-11-16 21:15:34 -03:00
Belen Curcio b116bef002 Ádding Debouncing for CheckAvailability, Valid Check form and Styling 2016-11-16 20:57:42 -03:00
Belen Curcio 60c17fc973 Ádding Debouncing for CheckAvailability, Valid Check form and Styling 2016-11-16 20:56:05 -03:00
Belen Curcio bd47495b63 User Email Availability check 2016-11-16 16:55:47 -03:00
David Jay 861550b4c6 Fixing notification langauge. 2016-11-16 14:00:21 -05:00
David Erwin e6ff70784d Merge branch 'master' into site-wide-comments 2016-11-16 10:48:28 -05:00
David Erwin b55d3768ff Merge master into site-wide-comments 2016-11-16 10:43:35 -05: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 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
Belen Curcio 954f6d9ee3 Sign in with local account 2016-11-15 17:41:41 -03: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
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 14405b22aa Stripping out protocol and query from asset url. 2016-11-14 20:02:01 -05: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
David Jay 16fa3e46f5 Loading comment stream based on parent URL. 2016-11-14 16:51:54 -05:00