 Belen Curcio
|
4b0d64dfc6
|
New path
|
2017-11-30 11:18:34 -03:00 |
|
|
Belen Curcio
|
a78bff5ee6
|
Merge branch 'master' of github.com:coralproject/talk into user-status-refactor
|
2017-11-30 11:12:53 -03:00 |
|
|
Kim Gardner
|
1c01a3320f
|
Merge pull request #1179 from coralproject/firefox-hover-tab
Firefox hover tab
|
2017-11-28 20:16:22 +00:00 |
|
|
Wyatt Johnson
|
8d018df0d1
|
Merge branch 'master' into firefox-hover-tab
|
2017-11-28 13:05:50 -07:00 |
|
|
Kim Gardner
|
b2a2b135a4
|
Merge pull request #1173 from coralproject/refactor-configure
Rewrite/Refactor stream configure
|
2017-11-28 19:49:49 +00:00 |
|
|
Kim Gardner
|
ccd22ea334
|
Merge branch 'master' of git+ssh://github.com/coralproject/talk into refactor-configure
|
2017-11-28 19:40:22 +00:00 |
|
|
Kim Gardner
|
83910f7fce
|
Merge pull request #1163 from coralproject/extendable-embed-stream-tab
Extendable embed stream tabs
|
2017-11-28 19:39:36 +00:00 |
|
|
Belen Curcio
|
321f3117a4
|
Linting
|
2017-11-28 15:08:04 -03:00 |
|
|
Belen Curcio
|
09839ab024
|
Updating after approving a user
|
2017-11-28 15:00:01 -03:00 |
|
|
Belen Curcio
|
da2b9aca03
|
Removing ternary
|
2017-11-28 14:56:29 -03:00 |
|
|
Belen Curcio
|
20d0cbaf27
|
Wrong filename
|
2017-11-28 14:52:31 -03:00 |
|
|
Belen Curcio
|
c177403628
|
Merge branch 'user-status-refactor' of github.com:coralproject/talk into user-status-refactor
|
2017-11-28 14:37:50 -03:00 |
|
|
Belen Curcio
|
b7704fb2ca
|
Translations and Styling
|
2017-11-28 14:37:23 -03:00 |
|
|
Wyatt Johnson
|
2437401daf
|
Merge branch 'next' into user-status-refactor
|
2017-11-28 09:47:34 -07:00 |
|
|
Wyatt Johnson
|
7f189cd4d4
|
Merge branch 'master' into next
|
2017-11-28 09:47:21 -07:00 |
|
|
Wyatt Johnson
|
28873ed961
|
Merge branch 'master' into refactor-configure
|
2017-11-28 09:46:11 -07:00 |
|
|
Belen Curcio
|
16e3924d3f
|
Ban user dialog steps
|
2017-11-28 13:39:49 -03:00 |
|
|
Kim Gardner
|
e3febf4a0c
|
Merge branch 'master' into firefox-hover-tab
|
2017-11-28 16:32:57 +00:00 |
|
|
Kim Gardner
|
c3b25d2d0a
|
Merge branch 'master' into extendable-embed-stream-tab
|
2017-11-28 16:31:50 +00:00 |
|
|
Kim Gardner
|
96a375e38a
|
Merge pull request #1183 from coralproject/bump-version-3-8-1
Version 3.8.1
|
2017-11-28 16:30:45 +00:00 |
|
|
Wyatt Johnson
|
417a7a3c36
|
added excemption as no fix available as of yet
|
2017-11-28 09:16:33 -07:00 |
|
|
Wyatt Johnson
|
c903d8c0f9
|
Merge branch 'master' into bump-version-3-8-1
|
2017-11-28 08:44:46 -07:00 |
|
|
Belen Curcio
|
d510905ba2
|
Adding ban message and setRole
|
2017-11-28 00:18:09 -03:00 |
|
|
Wyatt Johnson
|
d4889eb52c
|
more role fixes
|
2017-11-27 16:44:40 -07:00 |
|
|
Wyatt Johnson
|
f2fe095b43
|
fixed bug with featuring comments doesn't work
|
2017-11-27 16:27:43 -07:00 |
|
|
Wyatt Johnson
|
13865ff29e
|
roles -> role, null -> COMMENTER for user roles
|
2017-11-27 11:53:40 -07:00 |
|
|
Belen Curcio
|
9386912b9b
|
Approve Username fix
|
2017-11-27 14:43:04 -03:00 |
|
|
Kim Gardner
|
24e895460b
|
Merge branch 'master' into firefox-hover-tab
|
2017-11-27 17:23:36 +00:00 |
|
|
Kim Gardner
|
d6a83201ad
|
Merge branch 'master' into extendable-embed-stream-tab
|
2017-11-27 17:21:24 +00:00 |
|
|
Kim Gardner
|
bbdde50858
|
Merge pull request #1177 from coralproject/graph-context-connectors
Graph Context Connectors
|
2017-11-27 17:20:48 +00:00 |
|
|
Kim Gardner
|
8730ada87c
|
Merge branch 'master' into extendable-embed-stream-tab
|
2017-11-27 16:30:22 +00:00 |
|
|
Kim Gardner
|
506b938536
|
Merge branch 'master' into firefox-hover-tab
|
2017-11-27 16:30:12 +00:00 |
|
|
Kim Gardner
|
043e722d95
|
Merge branch 'master' into graph-context-connectors
|
2017-11-27 16:30:04 +00:00 |
|
|
Kim Gardner
|
fb1dc23fa9
|
Version 3.8.1
|
2017-11-27 16:28:46 +00:00 |
|
|
Kim Gardner
|
e882b51ed0
|
Merge pull request #1172 from coralproject/update-bug-report-link
Update Report Bug link in Admin Settings
|
2017-11-27 16:27:40 +00:00 |
|
|
Kim Gardner
|
e52a6fd9c1
|
Merge branch 'master' into update-bug-report-link
|
2017-11-27 16:15:04 +00:00 |
|
|
Belen Curcio
|
95d356de10
|
Adding UserDetailCommentList
|
2017-11-27 12:20:22 -03:00 |
|
|
Kim Gardner
|
24af7b2812
|
Merge pull request #1180 from coralproject/autclose-firefox-bug
auto close input: fix styling bug in firefox
|
2017-11-27 13:17:30 +00:00 |
|
|
Kim Gardner
|
24b5a58584
|
Merge branch 'master' into autclose-firefox-bug
|
2017-11-27 13:07:10 +00:00 |
|
|
Kim Gardner
|
a868cc9c67
|
Merge pull request #1178 from coralproject/more-padding-qbox
More padding for question box
|
2017-11-27 13:05:52 +00:00 |
|
|
Kim Gardner
|
af83d32de1
|
Merge branch 'master' into more-padding-qbox
|
2017-11-27 12:51:50 +00:00 |
|
|
Kim Gardner
|
fa82824d03
|
Merge pull request #1181 from coralproject/firefox-stories
Fix radiogroup not working properly in ff
|
2017-11-27 12:51:39 +00:00 |
|
|
Kim Gardner
|
f0033a7912
|
Merge branch 'master' into firefox-stories
|
2017-11-27 12:41:14 +00:00 |
|
|
Kim Gardner
|
0924531677
|
Merge pull request #1182 from coralproject/sort-stories
Sort by publication_date
|
2017-11-27 12:40:50 +00:00 |
|
|
Kim Gardner
|
44b77597ed
|
Merge branch 'master' into update-bug-report-link
|
2017-11-27 12:36:59 +00:00 |
|
|
Belen Curcio
|
f2dccf7845
|
Adding addUserRole and removeUserRole
|
2017-11-24 18:36:59 -03:00 |
|
|
Belen Curcio
|
e442961dbb
|
UserDetail Refactor
|
2017-11-24 18:09:22 -03:00 |
|
|
Belen Curcio
|
d58e54befa
|
UserDetail Refactor
|
2017-11-24 17:35:53 -03:00 |
|
|
Belen Curcio
|
0fe9577abf
|
Build User History
|
2017-11-24 16:24:11 -03:00 |
|
|
Belen Curcio
|
9703b86784
|
Working account history
|
2017-11-24 13:42:45 -03:00 |
|