 David Erwin
|
a022ef8a52
|
Restore embed/stream.ejs
|
2016-11-25 10:50:30 -05:00 |
|
|
David Erwin
|
93cd4ea74c
|
Remove non-standard stream embed template
|
2016-11-25 10:43:32 -05:00 |
|
|
David Erwin
|
7a6ea34468
|
Remove the preview link
|
2016-11-25 10:42:38 -05:00 |
|
|
David Erwin
|
bb8570a3d4
|
Merge pull request #94 from coralproject/issue-89
The field is action_type and not action.
|
2016-11-25 10:39:44 -05:00 |
|
|
David Erwin
|
6663e59fb3
|
Merge branch 'master' into issue-89
|
2016-11-25 10:36:36 -05:00 |
|
|
David Erwin
|
ec746f1ba1
|
Merge pull request #93 from coralproject/authorization
Added authorization pieces + test functions
|
2016-11-25 10:36:17 -05:00 |
|
|
David Erwin
|
c0de7a40c3
|
Merge branch 'master' into issue-89
|
2016-11-25 10:31:55 -05:00 |
|
|
gaba
|
e5c02c4274
|
The field is action_type and not action.
|
2016-11-22 17:14:24 -08:00 |
|
|
Wyatt Johnson
|
29a8b686b3
|
Merge branch 'master' into authorization
|
2016-11-22 17:23:14 -07:00 |
|
|
Wyatt Johnson
|
325162cb3e
|
Added authorization pieces + test functions
|
2016-11-22 17:15:14 -07:00 |
|
|
Wyatt Johnson
|
78f751344a
|
Update PULL_REQUEST_TEMPLATE.md
|
2016-11-22 17:01:48 -07:00 |
|
|
Kim Gardner
|
30547ad2ff
|
Merge pull request #88 from coralproject/reply-update
Reply update
|
2016-11-22 17:18:12 -05: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 |
|
|
Gabriela Rodríguez Berón
|
32d715e784
|
Merge pull request #86 from coralproject/fix-icon
Icon was missing
|
2016-11-22 12:44:23 -08:00 |
|
|
gaba
|
1eb2d04136
|
Icon was missing
|
2016-11-22 12:35:43 -08:00 |
|
|
Gabriela Rodríguez Berón
|
d5d02aef32
|
Merge pull request #79 from coralproject/user-integration
User integration
|
2016-11-22 09:30:27 -08:00 |
|
|
David Jay
|
2e54a51678
|
Merge branch 'master' into user-integration
|
2016-11-22 12:09:29 -05:00 |
|
|
Wyatt Johnson
|
ed6a421609
|
Merge pull request #83 from coralproject/fixes
Added fixes for prod
|
2016-11-22 09:32:51 -07: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
|
9ecb95dc71
|
Merge pull request #82 from coralproject/admin
Admin/User Permissions
|
2016-11-22 08:36:10 -07:00 |
|
|
Wyatt Johnson
|
00a8c59c96
|
Merge branch 'master' into admin
|
2016-11-22 08:31:21 -07:00 |
|
|
Wyatt Johnson
|
5b4b9c544e
|
Removed .idea folder
|
2016-11-22 08:15:38 -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
|
b8212c8986
|
Merge branch 'master' of https://github.com/coralproject/talk into user-integration
|
2016-11-21 19:24:31 -05:00 |
|
|
David Jay
|
1931c85d67
|
Merging
|
2016-11-21 19:23:29 -05:00 |
|
|
David Jay
|
715e40f020
|
Merge pull request #81 from coralproject/connect-reset-to-fe
Connect reset to fe
|
2016-11-21 19:17:18 -05:00 |
|
|
David Jay
|
06686105c4
|
Merge branch 'master' into connect-reset-to-fe
|
2016-11-21 19:06:04 -05:00 |
|
|
David Jay
|
d355211a53
|
Merge pull request #80 from coralproject/wordlist
Wordlist
|
2016-11-21 18:49:33 -05:00 |
|
|
Riley Davis
|
8a1c9ce44e
|
Merged branch master into connect-reset-to-fe
|
2016-11-21 16:36:40 -07:00 |
|
|
Riley Davis
|
ae1002fbbf
|
update to root url
|
2016-11-21 16:36:07 -07:00 |
|
|
Riley Davis
|
a0469301bb
|
add password reset form
|
2016-11-21 16:32:07 -07: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
|
f5f38004a2
|
Merge branch 'master' of https://github.com/coralproject/talk into user-integration
|
2016-11-21 17:06:00 -05:00 |
|
|
David Jay
|
357191484d
|
Updating tests.
|
2016-11-21 17:04:47 -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 |
|
|
Wyatt Johnson
|
642e05f999
|
Merge branch 'master' into wordlist
|
2016-11-21 14:18:16 -07:00 |
|
|
Andrew Losowsky
|
1ab2e061eb
|
added word lists
|
2016-11-21 16:12:07 -05:00 |
|
|
Riley Davis
|
a375c63cbb
|
Merged branch master into connect-reset-to-fe
|
2016-11-21 12:56:43 -07:00 |
|