 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 |
|
|
David Jay
|
a06d1d4bbb
|
Merge branch 'master' into stream-e2e
|
2016-11-22 18:58:54 -05:00 |
|
|
David Jay
|
9a98ccc846
|
Commenting out blocked tests and log statements.
|
2016-11-22 18:48:45 -05:00 |
|
|
David Jay
|
5ab3fba818
|
Setting env variables properly in tests.
|
2016-11-22 18:45:11 -05:00 |
|
|
gaba
|
a192c08496
|
Merge branch 'master' into ban-user
|
2016-11-22 14:53:13 -08:00 |
|
|
gaba
|
ef2eef8b7f
|
Merge branch 'ban-user' of github.com:coralproject/talk into ban-user
|
2016-11-22 14:52:52 -08:00 |
|
|
gaba
|
822e13914a
|
Fix changeStatus
|
2016-11-22 14:52:43 -08: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 |
|
|
David Jay
|
18bfabfd43
|
Moving configuration setting to shared function
|
2016-11-22 16:02:57 -05:00 |
|
|
David Jay
|
2a19399b81
|
Moving configuration setting to shared function
|
2016-11-22 16:01:50 -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 |
|
|
David Jay
|
e40d5312da
|
Adding premod off reply test.
|
2016-11-22 15:36:52 -05:00 |
|
|
gaba
|
1eb2d04136
|
Icon was missing
|
2016-11-22 12:35:43 -08:00 |
|
|
gaba
|
ff6ee76d3d
|
Fix changeStatus
|
2016-11-22 12:32:33 -08:00 |
|
|
David Jay
|
4035ed02c2
|
Adding test env variables.
|
2016-11-22 15:29:45 -05:00 |
|
|
David Jay
|
3030bf4f22
|
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
|
2016-11-22 15:04:36 -05:00 |
|
|
David Jay
|
25c40fc212
|
Applying client.perform consistently.
|
2016-11-22 14:29:11 -05:00 |
|
|
David Jay
|
654e3580e7
|
Adding second test.
|
2016-11-22 13:49:21 -05:00 |
|
|
gaba
|
f7c4e8bf24
|
Merge branch 'master' into ban-user
|
2016-11-22 09:35:06 -08:00 |
|
|
gaba
|
7dc7df2601
|
Merge branch 'master' into ban-user
|
2016-11-22 09:30:52 -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 |
|
|
David Erwin
|
5ff27be160
|
Add CONTRIBUTING.md first draft
|
2016-11-22 11:59:54 -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
|
8507a699e8
|
Adressing linting errors.
|
2016-11-21 21:24:34 -05:00 |
|
|
David Jay
|
dd060c5fd1
|
Signing in via e2e and posting comment.
|
2016-11-21 21:23:48 -05:00 |
|
|
gaba
|
0a8ab759b5
|
Move into setStatus and other actions when banned and unbanned.
|
2016-11-21 17:01:36 -08: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 |
|