 Riley Davis
|
fddd8d63c7
|
Merge branch 'master' into premod-queue-fix
|
2017-04-20 14:53:51 -06:00 |
|
|
David Erwin
|
bdd8ec3789
|
Merge pull request #505 from coralproject/default-resolve-type
Added defaultResolveType
|
2017-04-20 16:40:24 -04:00 |
|
|
Riley Davis
|
8708fcf2cd
|
actually, we want to have the action_summaries on all requests, since a plugin could potentially pre-flag a pre-mod comment
|
2017-04-20 14:37:48 -06:00 |
|
|
David Erwin
|
1db168df8c
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 16:33:54 -04:00 |
|
|
Riley Davis
|
3dc2674f47
|
the pre-mod tab does not request action_summaries since there wouldn't be any
|
2017-04-20 14:33:49 -06:00 |
|
|
David Erwin
|
1ec30854c2
|
Merge pull request #510 from coralproject/login-popup
Login Popup
|
2017-04-20 16:10:18 -04:00 |
|
|
David Erwin
|
7c38b9b54f
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 16:03:38 -04:00 |
|
|
Chi Vinh Le
|
4519a550a2
|
Fix fresh login on profile
|
2017-04-21 02:27:26 +07:00 |
|
|
David Erwin
|
00e24ce88a
|
Merge branch 'master' into login-popup
|
2017-04-20 15:15:51 -04:00 |
|
|
David Erwin
|
467a32038e
|
Merge pull request #512 from coralproject/action-summary-fix
Action summary fix - Part Deux
|
2017-04-20 15:15:38 -04:00 |
|
|
Riley Davis
|
2d212393ff
|
Merge branch 'master' into login-popup
|
2017-04-20 12:57:13 -06:00 |
|
|
Riley Davis
|
d1729e5115
|
camel_case
|
2017-04-20 12:44:25 -06:00 |
|
|
David Erwin
|
85e552cf04
|
Merge branch 'master' into action-summary-fix
|
2017-04-20 14:40:16 -04:00 |
|
|
David Erwin
|
2c5f46b3ae
|
Merge pull request #513 from coralproject/fix-ignored-user-error
Fix ignored users when not logged in
|
2017-04-20 14:39:24 -04:00 |
|
|
Chi Vinh Le
|
3ff9313b03
|
Fix ignored users when not logged in
|
2017-04-21 01:18:51 +07:00 |
|
|
Belén Curcio
|
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 Erwin
|
900cb33122
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 13:38:06 -04:00 |
|
|
David Erwin
|
6075317564
|
Merge pull request #511 from coralproject/build-fix
Added --force to rebuild native modules
|
2017-04-20 13:37:33 -04:00 |
|
|
David Erwin
|
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 Erwin
|
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 Erwin
|
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 |
|
|
Kiwi
|
51b866cd65
|
Merge branch 'master' into default-resolve-type
|
2017-04-20 16:55:04 +07:00 |
|
|
Kiwi
|
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 Johnson
|
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 Davis
|
7b4e8ef204
|
Merge pull request #499 from coralproject/flag-detail
Flag detail
|
2017-04-19 13:38:01 -06:00 |
|
|
Riley Davis
|
1abafb7037
|
Merge branch 'master' into flag-detail
|
2017-04-19 11:21:55 -06:00 |
|
|
Riley Davis
|
1535f10450
|
Merge branch 'master' into action-label-fix
|
2017-04-19 11:11:21 -06:00 |
|
|
Riley Davis
|
82927b77be
|
Merge pull request #507 from coralproject/premod-load-collapse
Fix collapsing UI
|
2017-04-19 09:57:23 -06:00 |
|
|
Riley Davis
|
b34cd2d4c1
|
Merge branch 'master' into premod-load-collapse
|
2017-04-19 09:50:30 -06:00 |
|