 gaba
|
ee6c4bb831
|
Merge branch 'master' into issue-186
|
2016-12-16 17:55:21 -08:00 |
|
|
Gabriela Rodríguez Berón
|
fcb3eeca9e
|
Merge branch 'master' into add-flag-option
|
2016-12-16 17:53:22 -08:00 |
|
|
Gabriela Rodríguez Berón
|
d707110e17
|
Merge pull request #183 from coralproject/fix-config-warnings
fix some config warnings
|
2016-12-16 17:48:23 -08:00 |
|
|
Gabriela Rodríguez Berón
|
4f0c0d2e42
|
Merge branch 'master' into fix-config-warnings
|
2016-12-16 17:44:21 -08:00 |
|
|
Gabriela Rodríguez Berón
|
0e0aafeb1c
|
Merge branch 'master' into add-flag-option
|
2016-12-16 17:44:03 -08:00 |
|
|
Gabriela Rodríguez Berón
|
c824591c3b
|
Merge pull request #185 from coralproject/linting
Added comments to linter
|
2016-12-16 17:43:51 -08:00 |
|
|
gaba
|
3266934fc8
|
It needed to have the Moderation Modal inside a tab container too.
|
2016-12-16 17:39:22 -08:00 |
|
|
Wyatt Johnson
|
d9a595ff3d
|
Merge branch 'master' into suspect-wordlist
|
2016-12-16 17:07:56 -07:00 |
|
|
Wyatt Johnson
|
dc966afe8e
|
adjusted query style
|
2016-12-16 17:06:56 -07:00 |
|
|
gaba
|
d8d30e512b
|
Only on POST check for CSRF.
|
2016-12-16 16:02:45 -08:00 |
|
|
Wyatt Johnson
|
7f12741c13
|
added comments to linter
|
2016-12-16 16:46:15 -07:00 |
|
|
David Jay
|
5973560043
|
Updating translation.
|
2016-12-16 18:20:31 -05:00 |
|
|
David Jay
|
871836f636
|
Adding description field to flags.
|
2016-12-16 18:19:05 -05:00 |
|
|
David Jay
|
8f1a6a777c
|
Merge branch 'master' of github.com:coralproject/talk into admin-asset-list
|
2016-12-16 17:22:32 -05:00 |
|
|
David Jay
|
c34bf5036e
|
Updating page count.
|
2016-12-16 17:20:31 -05:00 |
|
|
Riley Davis
|
13994686e4
|
fix some config warnings
|
2016-12-16 15:20:02 -07:00 |
|
|
David Jay
|
0d2d6b52a5
|
Adding pagination.
|
2016-12-16 17:07:59 -05:00 |
|
|
Kim Gardner
|
f6a794f886
|
Merge pull request #181 from coralproject/fix-closed-at
Fixed closing at
|
2016-12-16 16:42:25 -05:00 |
|
|
Dan Zajdband
|
ad084847e5
|
Lint
|
2016-12-16 16:35:39 -05:00 |
|
|
David Jay
|
979b54166b
|
Updating search with delay.
|
2016-12-16 16:24:32 -05:00 |
|
|
Dan Zajdband
|
6ddece4717
|
Fixed closing at
|
2016-12-16 16:16:48 -05:00 |
|
|
Riley Davis
|
bcfff516cc
|
Merged branch master into suspect-wordlist
|
2016-12-16 13:57:34 -07:00 |
|
|
David Jay
|
d4880ff183
|
Adding asset sorting to endpoint.
|
2016-12-16 15:35:15 -05:00 |
|
|
Kim Gardner
|
0f36f1a5c4
|
Merge pull request #179 from coralproject/my-comments-designs
my comments design tweaks
|
2016-12-16 15:13:11 -05:00 |
|
|
Riley Davis
|
5d96ff9d63
|
Merge branch 'master' into my-comments-designs
|
2016-12-16 12:29:38 -07:00 |
|
|
Riley Davis
|
0aa7a216be
|
update tests
|
2016-12-16 12:29:27 -07:00 |
|
|
Riley Davis
|
647d62969d
|
design tweaks per kim
|
2016-12-16 12:24:32 -07:00 |
|
|
Dan Zajdband
|
decdfad39b
|
Adding show shortcuts button and minor fixes (#177)
* Adding show shortcuts button and minor fixes
* Lint
* Unwrapping the showComments method
|
2016-12-16 12:32:09 -05:00 |
|
|
Dan Zajdband
|
9e9291ba64
|
Lint
|
2016-12-16 12:07:54 -05:00 |
|
|
Dan Zajdband
|
8631c3bd9b
|
Adding show shortcuts button and minor fixes
|
2016-12-16 12:03:37 -05:00 |
|
|
riley
|
27116b84ce
|
Merged master into suspect-wordlist
|
2016-12-15 16:12:19 -07:00 |
|
|
gaba
|
b75408b067
|
Merge branch 'master' into csrf
|
2016-12-15 15:11:30 -08:00 |
|
|
Gabriela Rodríguez Berón
|
d6936cdf25
|
Merge pull request #172 from coralproject/login-fix
The current user can see their own roles.
|
2016-12-15 15:10:55 -08:00 |
|
|
gaba
|
670567b8b3
|
One more expect in the test.
|
2016-12-15 15:08:01 -08:00 |
|
|
Gabriela Rodríguez Berón
|
1d652442d0
|
Merge branch 'master' into login-fix
|
2016-12-15 15:07:37 -08:00 |
|
|
gaba
|
eb98a41bd5
|
Merge branch 'master' into csrf
|
2016-12-15 15:04:36 -08:00 |
|
|
Riley Davis
|
4b746c1c32
|
Merge pull request #176 from coralproject/add-tests-for-comment-endpoint
add tests for comment stream for non-admins
|
2016-12-15 16:02:42 -07:00 |
|
|
gaba
|
7b8131d4b0
|
Use session instead of cookies.
|
2016-12-15 15:01:05 -08:00 |
|
|
Riley Davis
|
64ac1610eb
|
address different comment in result
|
2016-12-15 15:58:56 -07:00 |
|
|
riley
|
833094b6dd
|
check the author_id instead of comment.id
|
2016-12-15 15:53:47 -07:00 |
|
|
riley
|
115d19945b
|
add tests for comment stream for non-admins
|
2016-12-15 15:43:22 -07:00 |
|
|
gaba
|
4a76e43309
|
Merge branch 'master' into csrf
|
2016-12-15 14:25:08 -08:00 |
|
|
Gabriela Rodríguez Berón
|
e157de8697
|
Merge pull request #175 from coralproject/fixing-my-fixing-fix
Fixing my fixing fix
|
2016-12-15 14:24:41 -08:00 |
|
|
riley
|
c7d4bb6961
|
add a newline so lint doesn't complain
|
2016-12-15 15:20:50 -07:00 |
|
|
riley
|
632956e084
|
failed to update tests. working now
|
2016-12-15 15:20:02 -07:00 |
|
|
gaba
|
70c86bf8f5
|
Merge branch 'master' into csrf
|
2016-12-15 13:54:22 -08:00 |
|
|
Gabriela Rodríguez Berón
|
459dda5b26
|
Merge pull request #174 from coralproject/fix-embed-pathing
comments not showing on embed page
|
2016-12-15 13:53:42 -08:00 |
|
|
Gabriela Rodríguez Berón
|
70ef071464
|
Merge branch 'master' into fix-embed-pathing
|
2016-12-15 13:50:41 -08:00 |
|
|
Gabriela Rodríguez Berón
|
a309c8939d
|
Merge pull request #173 from coralproject/my-comments-fix
allow non-admin folks to list their comments
|
2016-12-15 13:44:26 -08:00 |
|
|
Riley Davis
|
181e558b28
|
comments not showing on embed page
|
2016-12-15 14:36:14 -07:00 |
|