 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 |
|
|
gaba
|
eb916099bd
|
Merge
|
2016-12-02 16:52:16 -08:00 |
|
|
gaba
|
60d4793111
|
Adds a variable to the possible translations.
|
2016-12-02 16:12:24 -08:00 |
|
|
gaba
|
07e3a935ab
|
Show the Dialog.
|
2016-12-02 16:03:19 -08:00 |
|
|
gaba
|
d12693ae47
|
Adds a variable to the translation.
|
2016-12-02 16:02:50 -08:00 |
|
|
David Jay
|
ead66520e2
|
Adjusting height of login button to match current comment.
|
2016-12-02 17:01:06 -05:00 |
|
|
David Erwin
|
e6a32c91a2
|
Merge branch 'master' into wordlist
|
2016-12-02 16:02:44 -05: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 |
|
|
gaba
|
1cda5b9099
|
Restrict content in the comment stream when banned.
|
2016-12-02 08:00:26 -08:00 |
|
|
gaba
|
da7f39c9e9
|
Merge branch 'master' into ban-user
|
2016-12-02 07:58:46 -08:00 |
|
|
gaba
|
29f547d268
|
Trying to fix ban user dialog.
|
2016-12-02 06:35:55 -08:00 |
|
|
David Jay
|
0e75319c04
|
Moving banned wordlist text to translations.
|
2016-12-01 21:49:55 -05:00 |
|
|
David Jay
|
b5b0cd9b12
|
Adding banned word notification on post.
|
2016-12-01 21:32:08 -05:00 |
|
|
David Jay
|
2cb439ccf8
|
Reloading banned word list from settings.
|
2016-12-01 21:12:13 -05:00 |
|
|
David Jay
|
a91b73e94a
|
Fixing bug when writing settings to state.
|
2016-12-01 20:26:48 -05:00 |
|
|
David Jay
|
827b94001a
|
Changing save button color when settings are changed
|
2016-12-01 20:24:34 -05:00 |
|
|
David Jay
|
a16faddac6
|
Adding banned word list.
|
2016-12-01 20:11:33 -05:00 |
|
|
David Jay
|
957837169f
|
Moving configuration sections to seperate files.
|
2016-12-01 19:35:35 -05:00 |
|
|
David Jay
|
ef58c439f2
|
Adding banned word list menu option.
|
2016-12-01 18:46:02 -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 |
|
|
gaba
|
c83f8eb188
|
Onclick action.
|
2016-12-01 13:11:44 -08:00 |
|
|
gaba
|
15eb946f00
|
Trying to get the Dialog up.
|
2016-12-01 13:05:10 -08: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 |
|