wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-17 11:33:39 +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
Belén CurcioandGitHub fc4b821f05 Merge branch 'master' into action-summary-fix 2017-04-20 15:04:09 -03:00
Chi Vinh Le 8fc2d5e8aa Merge branch 'login-popup' of ssh://github.com/coralproject/talk into login-popup 2017-04-21 00:54:45 +07:00
Chi Vinh Le f0e584f0b3 Restore login flow in ProfileContainer 2017-04-21 00:52:45 +07:00
Chi Vinh Le 6df2103da3 Remove obsolete offset and styling 2017-04-21 00:45:00 +07:00
David ErwinandGitHub 900cb33122 Merge branch 'master' into default-resolve-type 2017-04-20 13:38:06 -04:00
David ErwinandGitHub 6075317564 Merge pull request #511 from coralproject/build-fix 
Added --force to rebuild native modules
 2017-04-20 13:37:33 -04:00
David ErwinandGitHub f3f651c562 Merge branch 'master' into build-fix 2017-04-20 13:33:45 -04:00
Belen Curcio 1ffa78dcfb Merge branch 'login-popup' of github.com:coralproject/talk into login-popup 2017-04-20 14:28:16 -03:00
David ErwinandGitHub cbba3acf4a Merge pull request #508 from coralproject/action-label-fix 
Quick fix action labels in Mobile
 2017-04-20 13:27:37 -04:00
Chi Vinh Le f3f1cc53fe Fix safari popup resizing 2017-04-21 00:27:26 +07:00
David ErwinandGitHub 0de87af07a Merge branch 'master' into login-popup 2017-04-20 13:25:00 -04:00
Belen Curcio c47047c3ff Classes 2017-04-20 14:23:44 -03:00
Belen Curcio c9207fd620 Merge branch 'login-popup' of github.com:coralproject/talk into login-popup 2017-04-20 14:19:04 -03:00
Belen Curcio 09cb518049 Merge branch 'master' of github.com:coralproject/talk into login-popup 2017-04-20 14:18:40 -03:00
Chi Vinh Le 5b7750f7a5 Reuse same store and action flows 2017-04-20 23:48:30 +07:00
Riley Davis 50774f1922 remove null checks 2017-04-20 10:04:28 -06:00
Riley Davis eda15538fe add kiwi's and wyatt's changes 2017-04-20 10:02:09 -06:00
Wyatt Johnson 50219922d5 Switched to lock at node 7.8 2017-04-20 09:35:49 -06:00
Chi Vinh Le b12d4ef4a2 WIP 2017-04-20 21:30:24 +07:00
Chi Vinh Le 348c01ae80 Fix linting errors 2017-04-20 20:58:45 +07:00
Chi Vinh Le 1b95fbd852 Remove SignInContainer from admin 2017-04-20 20:34:36 +07:00
Chi Vinh Le 3bf2187688 Fix crashing admin when using framework 2017-04-20 18:45:55 +07:00
KiwiandGitHub 51b866cd65 Merge branch 'master' into default-resolve-type 2017-04-20 16:55:04 +07:00
KiwiandGitHub b7ffbdb762 Merge branch 'master' into action-label-fix 2017-04-20 16:48:12 +07:00
Riley Davis ffdec225c7 fix RespectButton component code 2017-04-19 22:02:57 -06:00
Riley Davis 59fbff3caf fix how FlagActionSummaries works in the embed 2017-04-19 21:15:03 -06:00
Wyatt JohnsonandGitHub 53f7ab86c0 Merge branch 'master' into build-fix 2017-04-19 18:16:12 -06:00
Wyatt Johnson 4ac71c884b added --force to rebuild native modules 2017-04-19 18:10:16 -06:00
Belen Curcio 6155a46e71 Sign up popup 2017-04-19 18:10:09 -03:00
Belen Curcio 13965e1111 Adding actions, routes and login popup 2017-04-19 17:04:49 -03:00
Riley DavisandGitHub 7b4e8ef204 Merge pull request #499 from coralproject/flag-detail 
Flag detail
 2017-04-19 13:38:01 -06:00
Chi Vinh Le 3cd9e802dd WIP 2017-04-20 00:37:45 +07:00
Riley DavisandGitHub 1abafb7037 Merge branch 'master' into flag-detail 2017-04-19 11:21:55 -06:00
Riley DavisandGitHub 1535f10450 Merge branch 'master' into action-label-fix 2017-04-19 11:11:21 -06:00
Chi Vinh Le 34fee9439f Move active tab to redux 2017-04-19 23:26:26 +07:00
Riley DavisandGitHub 82927b77be Merge pull request #507 from coralproject/premod-load-collapse 
Fix collapsing UI
 2017-04-19 09:57:23 -06:00
Riley DavisandGitHub b34cd2d4c1 Merge branch 'master' into premod-load-collapse 2017-04-19 09:50:30 -06:00
Riley DavisandGitHub bd0852bf68 Merge pull request #506 from coralproject/fix-load-more-premod 
Fix load more in premod queue
 2017-04-19 09:48:40 -06:00
Belén CurcioandGitHub c72a5c6df9 Merge branch 'master' into action-label-fix 2017-04-19 12:05:59 -03:00
Belen Curcio 9ddc6c35fd Action labels default.css, temporary fix 2017-04-19 11:59:07 -03:00
Chi Vinh Le 0e6b0c01fd Fix issue with ignoredUsers 2017-04-19 21:06:57 +07:00
Chi Vinh Le 6fb2a95bf2 Move query logic to coral-embed-stream 2017-04-19 20:28:14 +07:00
Chi Vinh Le f724353cf0 Fix collapsing UI 2017-04-19 16:38:02 +07:00
Chi Vinh Le 7698bdf930 Fix load more in premod queue 2017-04-19 16:35:53 +07:00
Chi Vinh Le d5d424bfc5 Merge branch 'master' into embed-refactor 2017-04-19 16:16:14 +07:00
KiwiandGitHub 1750510d34 Merge pull request #504 from coralproject/valid-notification-actions 
Return a value for notification actions
 2017-04-19 16:12:40 +07:00
Wyatt Johnson ecbb66e270 Fix linting 2017-04-18 15:53:15 -06:00
Wyatt Johnson 45094fd176 Optimized sub model 2017-04-18 15:48:33 -06:00
Wyatt Johnson e1c8e75405 Merge branch 'master' into subscriptions 2017-04-18 15:43:25 -06:00
gaba 1137fca3b4 Adds Tag Model that will be apply to different models. 2017-04-18 14:03:26 -07:00