 Belén Curcio
|
7d56404e84
|
Merge branch 'master' into subscriptions
|
2017-04-24 18:09:34 -03:00 |
|
|
Wyatt Johnson
|
4e060b884b
|
Fixed bug with status changes in the graph
|
2017-04-21 12:12:29 -06:00 |
|
|
Wyatt Johnson
|
1f562c8fad
|
Merge branch 'master' into subscriptions
|
2017-04-20 15:17:44 -06:00 |
|
|
Riley Davis
|
eda15538fe
|
add kiwi's and wyatt's changes
|
2017-04-20 10:02:09 -06:00 |
|
|
Wyatt Johnson
|
e1c8e75405
|
Merge branch 'master' into subscriptions
|
2017-04-18 15:43:25 -06:00 |
|
|
Belen Curcio
|
e729a673a3
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-17 14:17:42 -03:00 |
|
|
Wyatt Johnson
|
7fac8ef073
|
Merge branch 'master' into subscriptions
|
2017-04-17 08:03:14 -06:00 |
|
|
Wyatt Johnson
|
8164fa7813
|
Merge branch 'master' into docs-update
|
2017-04-14 15:07:02 -06:00 |
|
|
Wyatt Johnson
|
d4fc8a474d
|
Should resolve bug relating to usernames being set as "undefined"
|
2017-04-14 14:57:13 -06:00 |
|
|
Wyatt Johnson
|
cb652dbb86
|
Merge branch 'master' into docs-update
|
2017-04-14 12:23:43 -06:00 |
|
|
Benjamin Goering
|
118da885fd
|
Merge branch 'master' of github.com:coralproject/talk into ignore_rb2
|
2017-04-13 12:12:10 -05:00 |
|
|
Belen Curcio
|
7969985f59
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-12 22:27:46 -03:00 |
|
|
Wyatt Johnson
|
d5016dff58
|
Updates to metadata service docs
|
2017-04-12 16:37:56 -06:00 |
|
|
Wyatt Johnson
|
9f8c9c7eb1
|
Merge branch 'master' into subscriptions
|
2017-04-12 10:37:15 -06:00 |
|
|
Wyatt Johnson
|
191026ecf2
|
Merge branch 'master' into metadata
|
2017-04-12 10:37:12 -06:00 |
|
|
Belén Curcio
|
2ecf64ae3e
|
Merge branch 'master' into plugin_examples
|
2017-04-12 08:09:49 -03:00 |
|
|
Benjamin Goering
|
7dfe12b874
|
Users cannot ignore themselves at service layer
|
2017-04-11 14:20:37 -07:00 |
|
|
Benjamin Goering
|
2656141d59
|
Add stopIgnoringUser mutation and Embed uses it
|
2017-04-11 14:19:34 -07:00 |
|
|
Benjamin Goering
|
545f176bb8
|
Add ignoreUser mutation and myIgnoredUsers root query
|
2017-04-11 14:19:32 -07:00 |
|
|
gaba
|
c5520e3fb6
|
Adds missing template.
|
2017-04-11 12:22:05 -07:00 |
|
|
Belén Curcio
|
a77a623e94
|
Merge branch 'master' into plugin_examples
|
2017-04-11 15:13:51 -03:00 |
|
|
Belen Curcio
|
536b2ed371
|
Liniting
|
2017-04-11 13:46:27 -03:00 |
|
|
David Erwin
|
ab74ebdc52
|
Merge branch 'master' into subscriptions
|
2017-04-11 11:58:55 -04:00 |
|
|
David Erwin
|
2c8d03bd8d
|
Temporarily disable username profanity check
|
2017-04-11 11:05:55 -04:00 |
|
|
Wyatt Johnson
|
8e33d25a28
|
Some bug fixes + validation updates
|
2017-04-10 12:12:07 -06:00 |
|
|
Wyatt Johnson
|
735aa6fbd3
|
Added new Metadata Service and models
|
2017-04-07 16:40:30 -06:00 |
|
|
Wyatt Johnson
|
ffb0ee20e8
|
Cleanup of subscriptions
|
2017-04-05 16:15:22 -06:00 |
|
|
Wyatt Johnson
|
3c91b9cda1
|
Merge branch 'master' into subscriptions
|
2017-04-05 13:36:57 -06:00 |
|
|
Wyatt Johnson
|
8a06118d94
|
Added coral facebook auth plugin, some circ dep fixes
|
2017-04-05 11:39:54 -06:00 |
|
|
David Erwin
|
48b7a67665
|
Add comments
|
2017-04-05 11:24:52 -04:00 |
|
|
Wyatt Johnson
|
45c7cbad9e
|
Merge branch 'master' into subscriptions
|
2017-04-05 08:08:56 -06:00 |
|
|
Wyatt Johnson
|
07d1f9d3cf
|
Merge branch 'master' into subscriptions
|
2017-04-04 09:58:50 -06:00 |
|
|
Wyatt Johnson
|
c1dac11a2b
|
Updated docs, hook names
|
2017-04-03 16:11:34 -06:00 |
|
|
Wyatt Johnson
|
8d3524dd61
|
Added support for auth based plugins
|
2017-04-03 16:06:38 -06:00 |
|
|
Wyatt Johnson
|
1b8489165b
|
Merge branch 'master' into docker-plugins
|
2017-03-31 16:41:34 -06:00 |
|
|
Wyatt Johnson
|
0108673566
|
Added remote plugin reconciliation
|
2017-03-31 15:54:39 -06:00 |
|
|
Wyatt Johnson
|
ebcb3b4b02
|
Merge branch 'master' into dynamic-email-templates
|
2017-03-29 13:09:31 -06:00 |
|
|
Wyatt Johnson
|
dd3d1e9fe7
|
fix for session service
|
2017-03-29 12:45:57 -06:00 |
|
|
Wyatt Johnson
|
8680d6cab8
|
Fixes issues with wordlist and usernames
- Ensure that the wordlist can't contain emoji's
- Ensure that username checks user the correct tokenizer
|
2017-03-29 10:57:12 -06:00 |
|
|
Wyatt Johnson
|
ffbe976760
|
working websockets
|
2017-03-29 09:35:56 -06:00 |
|
|
Wyatt Johnson
|
e7c0c5b638
|
adjusted path
|
2017-03-28 09:54:27 -06:00 |
|
|
Belén Curcio
|
4ff683b3af
|
Merge branch 'master' into dynamic-email-templates
|
2017-03-28 11:20:22 -03:00 |
|
|
Gabriela Rodríguez Berón
|
155be523ff
|
Merge branch 'master' into community-flags
|
2017-03-28 07:14:30 -07:00 |
|
|
Riley Davis
|
2ec5b243fb
|
hot-load email templates during development
|
2017-03-27 12:43:03 -06:00 |
|
|
gaba
|
b5d86a3380
|
Merge branch 'master' into community-flags
|
2017-03-24 11:19:30 -07:00 |
|
|
gaba
|
9eaed90318
|
Revert "Revert "Story 138187767 - Moderate Flag User Names""
This reverts commit 903aa23f19.
|
2017-03-24 11:15:42 -07:00 |
|
|
Riley Davis
|
8114608626
|
put the mongoose update opts in the right place
|
2017-03-24 11:33:06 -06:00 |
|
|
riley
|
5d5ad2585d
|
autoclose an article toggle
|
2017-03-24 10:40:12 -06:00 |
|
|
gaba
|
84f1d3ece2
|
Use findONeAndUpdate and the moderation queue for account flags should only give back pending accounts.
|
2017-03-23 16:02:25 -07:00 |
|
|
Riley Davis
|
984514d7eb
|
check whitelist before redirecting
|
2017-03-23 12:46:20 -06:00 |
|