 riley
|
0e3cd001e9
|
merge master
|
2016-11-28 16:38:25 -07:00 |
|
|
Riley Davis
|
d5ff0f8f28
|
keep it DRY. add getInit all over the place. update tests
|
2016-11-28 16:18:19 -07:00 |
|
|
David Jay
|
7cf05bbdca
|
Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream
|
2016-11-28 17:25:07 -05:00 |
|
|
David Jay
|
823c223cf1
|
Adding settings to redux store from stream.
|
2016-11-28 17:11:37 -05:00 |
|
|
Gabriela Rodríguez Berón
|
31b0453e82
|
Merge branch 'master' into logout
|
2016-11-28 12:33:42 -08:00 |
|
|
Riley Davis
|
25d53116f7
|
remove unused var
|
2016-11-28 12:49:29 -07:00 |
|
|
Riley Davis
|
0d7014f77a
|
add helpers to talk-adapter
|
2016-11-28 11:50:25 -07:00 |
|
|
Riley Davis
|
98c6ef5162
|
Merge branch 'master' into config-auth-fix
|
2016-11-28 11:30:28 -07:00 |
|
|
Wyatt Johnson
|
b0f01cf00f
|
Initial commit of asset queuing (#97)
* Initial commit of asset queuing
* Addresssing comments
|
2016-11-28 13:29:39 -05:00 |
|
|
Riley Davis
|
ee0e0ea9ed
|
import belen's fetch helpers
|
2016-11-28 11:17:41 -07:00 |
|
|
Riley Davis
|
c0eb202858
|
small refactor on items actions
|
2016-11-28 10:57:15 -07:00 |
|
|
Belen Curcio
|
3ebdca33f3
|
Logout func
|
2016-11-27 19:37:17 -03:00 |
|
|
gaba
|
e5c02c4274
|
The field is action_type and not action.
|
2016-11-22 17:14:24 -08:00 |
|
|
David Jay
|
6e6ba89706
|
Hiding reply box on post.
|
2016-11-22 16:51:22 -05:00 |
|
|
David Jay
|
dea62d8895
|
Fixing bug with reply author name.
|
2016-11-22 16:16:10 -05:00 |
|
|
David Jay
|
0d4a029529
|
Merge pull request #87 from coralproject/add-https-to-script
Adds https and accessibility to embed code.
|
2016-11-22 16:13:53 -05:00 |
|
|
David Jay
|
d04812fd36
|
Adding https and accessability to embed code.
|
2016-11-22 16:09:36 -05:00 |
|
|
gaba
|
1eb2d04136
|
Icon was missing
|
2016-11-22 12:35:43 -08:00 |
|
|
David Jay
|
2e54a51678
|
Merge branch 'master' into user-integration
|
2016-11-22 12:09:29 -05:00 |
|
|
Wyatt Johnson
|
8eacb01484
|
Added fixes for prod
|
2016-11-22 09:31:54 -07:00 |
|
|
David Jay
|
5c532dab5e
|
Merge branch 'master' of https://github.com/coralproject/talk into user-integration
|
2016-11-22 11:11:52 -05:00 |
|
|
Wyatt Johnson
|
00a8c59c96
|
Merge branch 'master' into admin
|
2016-11-22 08:31:21 -07:00 |
|
|
Belen Curcio
|
8108ca09ef
|
Permissions, views and somestyling
|
2016-11-22 11:04:56 -03:00 |
|
|
Belen Curcio
|
c8d7585e90
|
Added FabButton to CoralUI
|
2016-11-22 09:34:46 -03:00 |
|
|
Belen Curcio
|
6e6681a553
|
Styles and refactor errors
|
2016-11-22 09:08:08 -03:00 |
|
|
Belen Curcio
|
f7daa35c41
|
Active Routes
|
2016-11-22 08:32:26 -03:00 |
|
|
Bel
|
b74a1bece3
|
Link Routes
|
2016-11-22 08:10:46 -03:00 |
|
|
David Jay
|
1931c85d67
|
Merging
|
2016-11-21 19:23:29 -05:00 |
|
|
David Jay
|
06686105c4
|
Merge branch 'master' into connect-reset-to-fe
|
2016-11-21 19:06:04 -05:00 |
|
|
David Jay
|
2b9caf8daf
|
Updating frontend to utilize new action delete endpoint.
|
2016-11-21 18:00:50 -05:00 |
|
|
David Jay
|
1a648ca20e
|
Simplifying item references in CommentStream.
|
2016-11-21 17:12:55 -05:00 |
|
|
David Jay
|
c6b1e5a800
|
Adding frontend IDs to facilitate management of actions.
|
2016-11-21 16:54:01 -05:00 |
|
|
Bel
|
fa190b4b3e
|
CoralLogo added to Coral-UI as SVG. and Admin session
|
2016-11-21 18:30:12 -03:00 |
|
|
David Jay
|
9afc9640ee
|
Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room
|
2016-11-21 16:26:22 -05:00 |
|
|
David Jay
|
56205aee74
|
Expanding dialog box for signin.
|
2016-11-21 16:19:27 -05:00 |
|
|
Riley Davis
|
a375c63cbb
|
Merged branch master into connect-reset-to-fe
|
2016-11-21 12:56:43 -07:00 |
|
|
Wyatt Johnson
|
3abd6cabac
|
Merge branch 'master' into wordlist
|
2016-11-21 12:44:08 -07:00 |
|
|
Wyatt Johnson
|
7cc311bd81
|
Added wordlist, cleaned comments api
|
2016-11-21 11:18:52 -07:00 |
|
|
Gabriela Rodríguez Berón
|
645a06484d
|
Merge branch 'master' into user-integration
|
2016-11-18 20:47:38 -08:00 |
|
|
David Jay
|
1a1df1656f
|
Posting like and flag with appropriate user_id.
|
2016-11-18 23:20:17 -05:00 |
|
|
David Jay
|
a4a8b97873
|
Including author name when comments are first posted.
|
2016-11-18 23:15:41 -05:00 |
|
|
Riley Davis
|
506c514799
|
request pw reset from ui
|
2016-11-18 15:09:13 -07:00 |
|
|
Dan Zajdband
|
0f7d758336
|
fix(coral-admin): Linted code
|
2016-11-18 15:12:59 -05:00 |
|
|
David Jay
|
29bf5b9990
|
Adding author info to comments and author name display.
|
2016-11-18 14:22:21 -05:00 |
|
|
David Jay
|
a0db48ea22
|
Adding author id to posted comments.
|
2016-11-18 13:10:59 -05:00 |
|
|
David Jay
|
da07b737b2
|
Allowing commentstream to be rendered outside of embed.
|
2016-11-18 12:19:58 -05:00 |
|
|
Dan Zajdband
|
ee9dc7260f
|
add(coral-admin): Added cointains link warning
|
2016-11-18 12:15:53 -05:00 |
|
|
David Jay
|
95cd83c09e
|
Merge branch 'master' of https://github.com/coralproject/talk into notification-room
|
2016-11-18 11:55:47 -05:00 |
|
|
David Jay
|
b14bd02de6
|
Addressing style bug in FlagButton.
|
2016-11-18 11:51:08 -05:00 |
|
|
David Jay
|
53fa63b269
|
Fixing bug where reply buttons in replies to not operate as expected.
|
2016-11-18 11:30:38 -05:00 |
|