wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-06 02:48:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,586 Commits 10 Branches 125 Tags
6a46fb822d82237db9443bf94de63e8ed95de5d7
Commit Graph

1961 Commits

Author SHA1 Message Date
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
Belen Curcio 69ea37a520 removing mock 2016-11-14 18:48:08 -03: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
Belen Curcio 7f151c86a7 Ádding dispatcher for FacebookCallback 2016-11-14 17:28:36 -03:00
David Jay 494b7d808b Addressing lint error. 2016-11-14 13:02:08 -05: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
Belen Curcio d6dc3a8ba1 Sign up steps and Login 2016-11-12 12:21:33 -03:00
Belen Curcio f14353d464 SignIn Dialog 2016-11-12 00:12:54 -03:00
Belen Curcio 984b2acac4 Ádding Traslations and Same Origin Requests 2016-11-11 22:38:15 -03: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
Belen Curcio 103acd4bce Continue with Facebook Funtionalit 2016-11-11 20:18:22 -03: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
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
Riley Davis 4b6bf58d43 now with translations and page hostname 2016-11-11 13:17:18 -07: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
David Erwin e279a46df5 Merge master into load-settings 2016-11-11 11:24:44 -05:00