 gaba
|
270e6ba70c
|
Merge branch 'master' into asset-status
|
2016-12-12 22:20:45 -08:00 |
|
|
gaba
|
7a3b5b60f0
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-12-12 22:20:26 -08:00 |
|
|
gaba
|
9043ae9f20
|
We are using asset and not article.
|
2016-12-12 22:19:09 -08:00 |
|
|
gaba
|
475c84dfbc
|
Fix date comparision and change article for asset.
|
2016-12-12 22:18:11 -08:00 |
|
|
Kim GardnerandGitHub
|
e4ad374366
|
Merge pull request #162 from coralproject/wordlist
Fix banned word bug
|
2016-12-12 19:39:41 -05:00 |
|
|
gaba
|
0648b2b1c8
|
More tests.
|
2016-12-12 15:38:28 -08:00 |
|
|
David JayandGitHub
|
f58ede45d9
|
Merge branch 'master' into wordlist
|
2016-12-12 17:20:33 -05:00 |
|
|
gaba
|
83a7ffee6f
|
Merge branch 'master' into asset-status
|
2016-12-12 13:03:58 -08:00 |
|
|
gaba
|
ee38f697ad
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-12-12 13:03:51 -08:00 |
|
|
gaba
|
3b131ce315
|
Removes status field for Asset. Now closedAt and closedMessage are in the settings field.
|
2016-12-12 13:02:39 -08:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
43512819a5
|
Merge pull request #164 from coralproject/fix-signup-bug
Updating signup endpoint to reflect current api.
|
2016-12-12 13:01:47 -08:00 |
|
|
Wyatt JohnsonandGitHub
|
f7b4aed620
|
Merge branch 'master' into wordlist
|
2016-12-12 15:58:40 -05:00 |
|
|
David JayandGitHub
|
409c9c3eb5
|
Merge branch 'master' into fix-signup-bug
|
2016-12-12 15:56:26 -05:00 |
|
|
David Jay
|
cb576dca8f
|
Updating signup endpoint to reflect current api.
|
2016-12-12 15:52:34 -05:00 |
|
|
David JayandGitHub
|
e85906b841
|
Merge pull request #160 from coralproject/configure-bug
Configure Tab
|
2016-12-12 15:50:50 -05:00 |
|
|
David Jay
|
7b113c1931
|
Merge branch 'master' of github.com:coralproject/talk into wordlist
|
2016-12-12 13:37:43 -05:00 |
|
|
gaba
|
d228b30f36
|
Merge branch 'master' into asset-status
|
2016-12-12 10:34:05 -08:00 |
|
|
gaba
|
8da59c166e
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-12-12 10:33:57 -08:00 |
|
|
Belén CurcioandGitHub
|
55df0f3036
|
Merge branch 'master' into configure-bug
|
2016-12-12 14:08:32 -03:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
7fba082c02
|
Merge branch 'master' into asset-status
|
2016-12-11 18:56:07 -10:00 |
|
|
Belén CurcioandGitHub
|
93183015e0
|
Merge pull request #158 from coralproject/simplify-community-page
simplify Community page
|
2016-12-11 23:29:53 -03:00 |
|
|
Belen Curcio
|
42ff3ae4a2
|
filter restricted tabs
|
2016-12-11 23:10:25 -03:00 |
|
|
Belen Curcio
|
a872128a55
|
logOut Stae
|
2016-12-11 22:52:47 -03:00 |
|
|
gaba
|
5e21102c2f
|
Fix routes and tests for asset status change.
|
2016-12-10 14:01:24 -10:00 |
|
|
gaba
|
81071eacd6
|
It adds a status field and change the name of the closedAt and closedMessage to record changes from the status from closed to open too.
|
2016-12-10 14:00:46 -10:00 |
|
|
Riley DavisandGitHub
|
9e353eaae8
|
Merge branch 'master' into simplify-community-page
|
2016-12-09 15:06:43 -10:00 |
|
|
Riley DavisandGitHub
|
116368dcd3
|
Merge pull request #156 from coralproject/update-users-api
Updating user route to users.
|
2016-12-09 15:06:09 -10:00 |
|
|
Riley Davis
|
0f7e4bd239
|
simplify Community page
|
2016-12-09 14:52:17 -10:00 |
|
|
David Jay
|
faca09dbd2
|
Merge branch 'master' of github.com:coralproject/talk into update-users-api
|
2016-12-09 19:35:09 -05:00 |
|
|
Kim GardnerandGitHub
|
1c670835d1
|
Merge pull request #151 from coralproject/flag-bio
Flag bio
|
2016-12-09 14:30:19 -10:00 |
|
|
David Jay
|
d229d5a96f
|
Updating route to davidjay.
|
2016-12-09 19:28:19 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
02015bc5c3
|
Merge branch 'master' into flag-bio
|
2016-12-09 14:26:28 -10:00 |
|
|
Riley DavisandGitHub
|
2f5505c5f3
|
Merge pull request #152 from coralproject/fix-spelling
Typo
|
2016-12-09 14:24:48 -10:00 |
|
|
gaba
|
ffc2d0c86a
|
Spanish translations.
|
2016-12-09 14:16:27 -10:00 |
|
|
Kim Gardner
|
5279ad3305
|
Typo
|
2016-12-09 13:01:54 -10:00 |
|
|
David JayandGitHub
|
c27c379b36
|
Merge branch 'master' into flag-bio
|
2016-12-09 17:50:28 -05:00 |
|
|
David Jay
|
787486bccf
|
Posting bio flags to backend.
|
2016-12-09 17:46:45 -05:00 |
|
|
David JayandGitHub
|
be760bd9d7
|
Merge pull request #133 from coralproject/flag-username
Flag username
|
2016-12-09 16:58:50 -05:00 |
|
|
David Jay
|
9375d8b47d
|
Merge branch 'flag-username' into flag-bio
|
2016-12-09 16:46:56 -05:00 |
|
|
David Jay
|
ecbdc5d0b4
|
Making itemType consistent on backend.
|
2016-12-09 16:43:04 -05:00 |
|
|
David Jay
|
f5ac576187
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 16:33:06 -05:00 |
|
|
David Jay
|
acd57e4f68
|
Avoiding double-posting.
|
2016-12-09 16:15:33 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
403838b983
|
Merge pull request #121 from coralproject/ban-user
Ban user
|
2016-12-09 10:55:45 -10:00 |
|
|
David Jay
|
90ef16e111
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 15:51:13 -05:00 |
|
|
David Jay
|
8e432aad46
|
Adding Done button to last step of flagging menu.
|
2016-12-09 15:47:38 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
f29c0a3a09
|
Merge branch 'master' into ban-user
|
2016-12-09 10:43:55 -10:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
8ea61c3a05
|
Merge pull request #122 from coralproject/wordlist
Banned word list
|
2016-12-09 10:29:23 -10:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
ba169147e7
|
Merge branch 'master' into ban-user
|
2016-12-09 10:28:32 -10:00 |
|
|
David Jay
|
922fc630a4
|
Addressing null item_id in user flagging.
|
2016-12-09 15:27:11 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
1fefd3c8b4
|
Merge branch 'master' into wordlist
|
2016-12-09 10:26:39 -10:00 |
|