 Riley Davis
|
2d212393ff
|
Merge branch 'master' into login-popup
|
2017-04-20 12:57:13 -06: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 |
|
|
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
|
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 |
|
|
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
|
b7ffbdb762
|
Merge branch 'master' into action-label-fix
|
2017-04-20 16:48:12 +07: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 |
|
|
Riley Davis
|
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 Curcio
|
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
|
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 |
|
|
Kiwi
|
1750510d34
|
Merge pull request #504 from coralproject/valid-notification-actions
Return a value for notification actions
|
2017-04-19 16:12:40 +07:00 |
|
|
Chi Vinh Le
|
4ce4c74fd9
|
Return a value for notification actions
|
2017-04-19 01:09:59 +07:00 |
|
|
Belén Curcio
|
bfacc8f2f7
|
Merge pull request #479 from coralproject/plugin_examples
Hooks and Context for Comment Plugins And Off-Topic Plugin
|
2017-04-18 13:52:30 -03:00 |
|
|
Belén Curcio
|
ad15b38a5d
|
Merge branch 'master' into plugin_examples
|
2017-04-18 13:46:44 -03:00 |
|
|
Wyatt Johnson
|
fd6282077f
|
Adjusted test to conform to new form
|
2017-04-17 16:05:44 -06:00 |
|
|
Riley Davis
|
b5210f3727
|
more translations
|
2017-04-17 14:42:18 -06:00 |
|
|
Riley Davis
|
cc6882168b
|
add translations
|
2017-04-17 14:31:45 -06:00 |
|
|
Riley Davis
|
a5d11a05d1
|
Merge branch 'master' into flag-detail
|
2017-04-17 14:00:32 -06:00 |
|
|
Gabriela Rodríguez Berón
|
7526d64bc0
|
Merge pull request #493 from coralproject/143520971-stream-settings
Configure stream settings
|
2017-04-17 12:45:34 -07:00 |
|
|
Gabriela Rodríguez Berón
|
04a4918fd5
|
Update ConfigureStreamContainer.js
|
2017-04-17 12:35:29 -07:00 |
|
|
Gabriela Rodríguez Berón
|
371e3b951d
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:25:40 -07:00 |
|
|
gaba
|
f66e12be18
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:07:19 -07:00 |
|
|
gaba
|
fb010bfa67
|
Rename settings of the state to dirtySettings and add TO DO item to be sure we refactor this next time we do a refactor.
|
2017-04-17 11:51:24 -07:00 |
|
|
Belen Curcio
|
e729a673a3
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-17 14:17:42 -03:00 |
|