wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-14 11:18:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,775 Commits 10 Branches 125 Tags
4fcdec92d8e68b60efa047b50cdc4ec8fe1ee2ce
Commit Graph
8775 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David ErwinandGitHub 085828fbd0 Merge pull request #66 from coralproject/site-wide-comments 
Site wide comments
 2016-11-16 10:51:24 -05:00
David ErwinandGitHub e6ff70784d Merge branch 'master' into site-wide-comments 2016-11-16 10:48:28 -05:00
David ErwinandGitHub 0f8f59dcfd Merge pull request #68 from coralproject/comment-box 
Comment box
 2016-11-16 10:48:18 -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
Riley Davis c86e1e8d47 create and decode jwt 2016-11-15 16:21:25 -07: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ónandGitHub 0bfa68e699 Merge pull request #67 from coralproject/webpack-fix 
Added fix for webpack building
 2016-11-15 12:44:21 -08:00
Belen Curcio 954f6d9ee3 Sign in with local account 2016-11-15 17:41:41 -03:00
Wyatt Johnson 721c041332 Added fix for webpack building 2016-11-15 13:33:02 -07:00
riley e5898118e1 Merged master into password-reset 2016-11-15 13:11:02 -07:00
Riley DavisandGitHub 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
Riley Davis eabce87f99 Merged branch master into password-reset 2016-11-15 12:34:43 -07:00
David Jay fbf27a9d75 Resolving 500 error when deleting an action. 2016-11-15 14:24:38 -05:00
Riley DavisandGitHub 7ecd60fbf7 Merge branch 'master' into like-button 2016-11-15 12:15:13 -07:00
Riley DavisandGitHub 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
David Jay 4fd41704c0 Moving preview to embed code. 2016-11-15 12:31:30 -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
Belen Curcio 69ea37a520 removing mock 2016-11-14 18:48:08 -03:00
Dan Zajdband 9c41adf224 Added enum check for the user model 2016-11-14 16:44:21 -05:00
David Jay 688fbd0bf6 Sending asset_url to backend and retreiving stream with asset. 2016-11-14 16:40:04 -05:00
Belen Curcio 765b674cf9 Cleanup, and UserBox with Logout 2016-11-14 18:35:21 -03:00
Dan Zajdband 223887616d feature(coral-admin): Add users role change 2016-11-14 16:20:56 -05:00
David Jay 1a7b716820 Updating stream endpoint to expect asset_url and to return asset. 2016-11-14 15:51:17 -05:00
Riley Davis c1271d4d1b mailer module v1 2016-11-14 13:31:47 -07:00
Belen Curcio 7f151c86a7 Ádding dispatcher for FacebookCallback 2016-11-14 17:28:36 -03: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
Riley Davis 7d9b24c5b9 start adding mail settings 2016-11-14 10:44:33 -07:00
Belen Curcio ef2d67a940 Coral-UI, Coral Auth with Reducers, Helpers and Validation 2016-11-14 13:06:48 -03:00
Belen Curcio 9341caa4d5 Auth Actions 2016-11-14 13:04:44 -03:00
Belen Curcio e7d114d5df Close and Cancel actions 2016-11-12 13:27:04 -03:00
Belen Curcio dab93547b5 Handling Views 2016-11-12 12:54:27 -03:00
Belen Curcio eb752e6f73 Handling Views 2016-11-12 12:38:02 -03:00