 gaba
|
ff6ee76d3d
|
Fix changeStatus
|
2016-11-22 12:32:33 -08: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
gaba
|
8355f441e3
|
When banning without commentid.
|
2016-11-21 12:42:14 -08:00 |
|
|
gaba
|
3337e95a6c
|
Move the change status of the user to a ban the user func.
|
2016-11-21 12:18:19 -08:00 |
|
|
Riley Davis
|
a375c63cbb
|
Merged branch master into connect-reset-to-fe
|
2016-11-21 12:56:43 -07:00 |
|
|
Wyatt Johnson
|
a45a5f7296
|
Updated test to verify middleware is working
|
2016-11-21 12:49:04 -07:00 |
|
|
Wyatt Johnson
|
cab9ec3e52
|
Fixed package.json
|
2016-11-21 12:45:08 -07:00 |
|
|
Wyatt Johnson
|
3abd6cabac
|
Merge branch 'master' into wordlist
|
2016-11-21 12:44:08 -07:00 |
|
|
Wyatt Johnson
|
7893d425ef
|
Updated tests
|
2016-11-21 12:42:42 -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 |
|
|
gaba
|
2b3da02cb7
|
Merge branch 'master' into ban-user
|
2016-11-18 20:41:49 -08:00 |
|
|
gaba
|
225592d7b5
|
Modify the action for status update.
|
2016-11-18 20:39:11 -08:00 |
|
|
Gabriela Rodríguez Berón
|
2160a81b7b
|
Merge pull request #74 from coralproject/added-link-highlighting
add(coral-admin): Syntax highlighting on links
|
2016-11-18 20:38:35 -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 |
|