 Belen Curcio
|
ebf9754287
|
merge
|
2016-12-07 10:58:30 -03:00 |
|
|
Riley Davis
|
260d1bd9f4
|
restoring the scroll to comment functionality
|
2016-12-06 16:29:40 -10:00 |
|
|
Riley Davis
|
d9d9c50961
|
un-sneaking in some stuff
|
2016-12-06 15:52:22 -10:00 |
|
|
Riley Davis
|
1201196566
|
un-sneaking in some stuff
|
2016-12-06 15:51:22 -10:00 |
|
|
Riley Davis
|
09245403aa
|
riley is silly
|
2016-12-06 14:42:09 -10:00 |
|
|
Riley Davis
|
f2ded3f2a7
|
replace things multiple times
|
2016-12-06 14:34:27 -10:00 |
|
|
Riley Davis
|
31c87cb93f
|
make the translation function accept n arguments. ninja bugfix to permalink
|
2016-12-06 14:17:01 -10:00 |
|
|
Riley Davis
|
f2c751f9f0
|
Merge branch 'master' into i18n-var
|
2016-12-06 13:41:44 -10:00 |
|
|
David Jay
|
74eb09a807
|
Cleaning up after merge.
|
2016-12-06 18:20:19 -05:00 |
|
|
David Jay
|
507e89a301
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-06 18:19:45 -05:00 |
|
|
David Jay
|
9e69a453d9
|
Adding text to postAction in commentStream.
|
2016-12-06 18:14:53 -05:00 |
|
|
David Jay
|
13d0dec84a
|
Updating postAction to send reasons to backend.
|
2016-12-06 18:11:44 -05:00 |
|
|
David Jay
|
3438024624
|
Posting flag action.
|
2016-12-06 18:01:11 -05:00 |
|
|
David Jay
|
9da19e87ea
|
Adding options to popup menu.
|
2016-12-06 17:48:08 -05:00 |
|
|
David Jay
|
5e8315c0d7
|
Styling popup menu.
|
2016-12-06 15:46:03 -05:00 |
|
|
Wyatt Johnson
|
b82f130454
|
Adds a new closedAt time for assets to prevent new comments from being
created
|
2016-12-06 14:44:15 -05:00 |
|
|
David Jay
|
17e4e57171
|
Merge branch 'wordlist' of github.com:coralproject/talk into wordlist
|
2016-12-06 12:54:39 -05:00 |
|
|
David Jay
|
582c0c0c9e
|
Handling case where child and parent_id are undefined.
|
2016-12-06 12:53:35 -05:00 |
|
|
David Jay
|
bfcb2cdb21
|
Merge branch 'master' into wordlist
|
2016-12-06 12:44:23 -05:00 |
|
|
David Jay
|
b88c413d09
|
Merge pull request #128 from coralproject/status-history
Status history
|
2016-12-06 12:43:14 -05:00 |
|
|
Belen Curcio
|
e751d91794
|
typo
|
2016-12-06 14:21:02 -03:00 |
|
|
Belen Curcio
|
8036b4790d
|
Notifications
|
2016-12-06 14:09:36 -03:00 |
|
|
Wyatt Johnson
|
5298efa89f
|
Adjusting based on PR feedback, added public filter to settings object
|
2016-12-06 11:55:15 -05:00 |
|
|
Wyatt Johnson
|
d2d4640eee
|
Merge branch 'master' into status-history
|
2016-12-06 11:08:00 -05:00 |
|
|
Belen Curcio
|
623c32a002
|
Configure Stream Ready, Checkbox Coral UI
|
2016-12-06 12:18:29 -03:00 |
|
|
David Jay
|
3562d9f235
|
Merge branch 'master' into wordlist
|
2016-12-05 17:44:23 -05:00 |
|
|
Belén Curcio
|
c7108b7fed
|
Merge pull request #91 from coralproject/stream-e2e
Embed stream end to end testing
|
2016-12-05 19:39:14 -03:00 |
|
|
David Jay
|
ab43d1f0ac
|
Showing first set of options in menu.
|
2016-12-05 17:38:13 -05:00 |
|
|
Belén Curcio
|
67aa261a56
|
Merge branch 'master' into stream-e2e
|
2016-12-05 19:34:57 -03:00 |
|
|
Belén Curcio
|
e644b68f66
|
Merge pull request #127 from coralproject/close-comments
Adds the ability to close and open comments on an asset
|
2016-12-05 19:33:05 -03:00 |
|
|
Belen Curcio
|
08e232c4fe
|
User Should still be able to see sign info even if its closed // moving comp
|
2016-12-05 19:28:47 -03:00 |
|
|
Belen Curcio
|
03b6ec4fe4
|
Lint
|
2016-12-05 19:18:29 -03:00 |
|
|
Dan Zajdband
|
568e46f1e3
|
Added restricted wrapper
|
2016-12-05 17:02:21 -05:00 |
|
|
Dan Zajdband
|
62cc489c21
|
Merge with master
|
2016-12-05 16:39:00 -05:00 |
|
|
David Jay
|
a9bc90619d
|
Adding popup on report button click.
|
2016-12-05 15:59:16 -05:00 |
|
|
Wyatt Johnson
|
91efa60b55
|
Fixed linting error
|
2016-12-05 14:20:47 -05:00 |
|
|
Wyatt Johnson
|
d1cdc48e85
|
Merge branch 'master' into status-history
|
2016-12-05 14:20:31 -05:00 |
|
|
Wyatt Johnson
|
40fd5984a9
|
Added "assigned_by" to status changes
|
2016-12-05 13:49:12 -05:00 |
|
|
David Jay
|
9c19cabf3e
|
Merge branch 'master' into i18n-var
|
2016-12-05 12:43:40 -05:00 |
|
|
David Jay
|
7c02ece881
|
Merge branch 'master' into stream-e2e
|
2016-12-05 12:42:26 -05:00 |
|
|
Wyatt Johnson
|
2f7f0249b2
|
Added status changing + history
- Status's for comments is now an array of objects
|
2016-12-05 11:28:27 -05:00 |
|
|
Dan Zajdband
|
95ec57c64d
|
Added default message on thread
|
2016-12-05 11:11:21 -05:00 |
|
|
Dan Zajdband
|
4be258c63d
|
Added simple open/close flow
|
2016-12-05 11:02:39 -05:00 |
|
|
Kim Gardner
|
bd30b41d3b
|
Merge branch 'master' into wordlist
|
2016-12-04 01:03:19 -05:00 |
|
|
Kim Gardner
|
51c29e0c31
|
Merge branch 'master' into like-login-prompt
|
2016-12-04 00:59:39 -05:00 |
|
|
Kim Gardner
|
d85d15a55a
|
Merge pull request #84 from coralproject/guides
Add CONTRIBUTING.md first draft
|
2016-12-04 00:59:08 -05:00 |
|
|
Kim Gardner
|
e528e0678f
|
Merge branch 'master' into stream-e2e
|
2016-12-04 00:49:27 -05:00 |
|
|
Kim Gardner
|
ea604d54ac
|
Merge branch 'master' into like-login-prompt
|
2016-12-04 00:48:50 -05:00 |
|
|
Kim Gardner
|
2f965f2009
|
Merge branch 'master' into guides
|
2016-12-04 00:47:32 -05:00 |
|
|
gaba
|
3463e09cab
|
Setting the showuserdialog in the reducer for comments.
|
2016-12-02 17:05:23 -08:00 |
|