 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
|
b88c413d09
|
Merge pull request #128 from coralproject/status-history
Status history
|
2016-12-06 12:43:14 -05: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 |
|
|
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 |
|
|
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 |
|
|
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
|
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
|
2f965f2009
|
Merge branch 'master' into guides
|
2016-12-04 00:47:32 -05:00 |
|
|
gaba
|
60d4793111
|
Adds a variable to the possible translations.
|
2016-12-02 16:12:24 -08:00 |
|
|
David Erwin
|
6990600c10
|
Merge pull request #124 from coralproject/like-login-prompt
Like/Flag Login Prompt
|
2016-12-02 16:02:34 -05:00 |
|
|
David Erwin
|
f2273f1698
|
Merge branch 'master' into like-login-prompt
|
2016-12-02 15:58:54 -05:00 |
|
|
David Erwin
|
9f9e80e647
|
Merge pull request #123 from coralproject/info-box-fix
Info box fix
|
2016-12-02 15:50:40 -05:00 |
|
|
David Jay
|
0eca9eeadc
|
Prompting login when a loggout out user likes or comments.
|
2016-12-02 15:45:26 -05:00 |
|
|
David Jay
|
c387df55f3
|
Removing .env-test
|
2016-12-02 12:52:43 -05:00 |
|
|
David Jay
|
b1d0f8443f
|
Updating infobox styling.
|
2016-12-02 12:47:18 -05:00 |
|
|
David Jay
|
8dad90104d
|
Returning infobox data in stream.
|
2016-12-02 12:26:31 -05:00 |
|
|
David Jay
|
94dd79b6a7
|
Updating test db logic.
|
2016-12-02 12:03:25 -05:00 |
|
|
David Jay
|
e5fe91af8b
|
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
|
2016-12-01 18:25:08 -05:00 |
|
|
David Jay
|
a118d263ea
|
Cleaning url regex in commentstream.
|
2016-12-01 16:23:33 -05:00 |
|
|
David Jay
|
d853b1f912
|
Merging master into stream-e2e
|
2016-12-01 14:36:47 -05:00 |
|
|
Belén Curcio
|
e6b9cf4b7d
|
Merge pull request #120 from coralproject/bio
User Bio and Settings Tab
|
2016-12-01 13:07:25 -03:00 |
|
|
Belen Curcio
|
647fb06c99
|
HandleSave on Submit
|
2016-12-01 12:58:37 -03:00 |
|
|
Belen Curcio
|
990782a542
|
Sign in a restricted rout
|
2016-12-01 11:17:07 -03:00 |
|
|
David Erwin
|
17a8e4bb25
|
Merge branch 'master' into guides
|
2016-11-30 22:07:13 -05:00 |
|
|
Belen Curcio
|
c38c556002
|
merge
|
2016-11-30 20:11:22 -03:00 |
|
|
David Jay
|
b2b9b0ec42
|
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
|
2016-11-30 17:55:39 -05:00 |
|
|
David Jay
|
3f1f678fb2
|
Adding comment count test.
|
2016-11-30 17:49:08 -05:00 |
|
|
David Jay
|
fe4e9c5ea9
|
All e2e tests passing.
|
2016-11-30 17:38:23 -05:00 |
|
|
David Jay
|
c93bc67a40
|
Removing mocks from pree2e
|
2016-11-30 16:29:05 -05:00 |
|
|
David Jay
|
7503ba9ab3
|
Moving settings to mocks.
|
2016-11-30 16:27:03 -05:00 |
|
|
David Jay
|
2b0a503c6a
|
Adding mock functions to tests.
|
2016-11-30 16:18:54 -05:00 |
|
|
Gabriela Rodríguez Berón
|
d3ff89fd25
|
Merge pull request #113 from coralproject/mod-queue-fix
Add user info to moderation queue
|
2016-11-30 12:54:15 -08:00 |
|
|
David Jay
|
34671fb327
|
Fixing filter in moderation queue.
|
2016-11-30 15:38:43 -05:00 |
|
|
David Jay
|
03db1de41a
|
Removing log statement.
|
2016-11-30 15:15:58 -05:00 |
|