 gaba
|
60d2735fa5
|
Remove isfetching all together.
|
2017-04-26 14:26:22 -05:00 |
|
|
gaba
|
6f58754617
|
Removing the Loading all together.
|
2017-04-26 14:26:21 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
e935fff8ac
|
Merge branch 'master' into 143530761-remove-loading-when-searching
|
2017-04-26 12:52:30 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
3ad8d9ffec
|
Merge branch 'master' into 143202319-mod-queue-shortcuts
|
2017-04-26 12:51:30 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
9e35b7b39f
|
Merge branch 'master' into 143202319-mod-queue-shortcuts
|
2017-04-25 16:10:23 -05:00 |
|
|
gaba
|
33d71df049
|
Recover the scroll.
|
2017-04-25 15:52:52 -05:00 |
|
|
gaba
|
10cd53b40b
|
Only shows the Loading component when there is no search value
|
2017-04-25 14:28:37 -05:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
a41108a53c
|
Merge branch 'master' into shortcut-hint
|
2017-04-21 15:10:42 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
e337a0d18b
|
Merge branch 'master' into subscriptions
|
2017-04-21 14:35:21 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
e9c81f0639
|
Merge branch 'master' into all-comments-queue
|
2017-04-21 14:31:16 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
c68afe9819
|
Merge branch 'master' into status-fix
|
2017-04-21 11:56:44 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
fcf25e0b96
|
Merge pull request #518 from coralproject/flag-action-fix
Added fix for flag actions
|
2017-04-21 11:56:24 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
7526d64bc0
|
Merge pull request #493 from coralproject/143520971-stream-settings
Configure stream settings
|
2017-04-17 12:45:34 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
04a4918fd5
|
Update ConfigureStreamContainer.js
|
2017-04-17 12:35:29 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
371e3b951d
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:25:40 -07:00 |
|
|
gaba
|
f66e12be18
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:07:19 -07:00 |
|
|
gaba
|
fb010bfa67
|
Rename settings of the state to dirtySettings and add TO DO item to be sure we refactor this next time we do a refactor.
|
2017-04-17 11:51:24 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
81e040397e
|
Merge branch 'master' into docs-update
|
2017-04-14 12:09:45 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
99b0f8f2ad
|
Merge pull request #497 from coralproject/docs-metrics
EXTRA-SHORT: A note on the from/to parameters.
|
2017-04-14 11:29:08 -07:00 |
|
|
gaba
|
fa944927e4
|
A note on the from/to parameters.
|
2017-04-14 10:41:46 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
fb6ba37366
|
Merge branch 'master' into docs-metrics
|
2017-04-14 10:40:28 -07:00 |
|
|
gaba
|
9cf31e0bfa
|
A note on the from/to parameters.
|
2017-04-14 10:37:05 -07:00 |
|
|
gaba
|
d9c8882d8f
|
More translations in the configuration.
|
2017-04-13 16:19:21 -07:00 |
|
|
gaba
|
902071c0fe
|
Adds title of most flagged in dashboard.
|
2017-04-13 16:11:25 -07:00 |
|
|
gaba
|
c395bc8849
|
Adds closedAt to state... and check that closedTimeout settings exists for the Asset.
|
2017-04-13 14:21:45 -07:00 |
|
|
gaba
|
fa72a661ad
|
Going back to previous setting state as I do not want it to re-render.
|
2017-04-13 12:43:24 -07:00 |
|
|
gaba
|
9dae72dd8a
|
Good catch. Use setState.
|
2017-04-13 11:44:08 -07:00 |
|
|
gaba
|
abc7aa7b30
|
Uh... wrong element.
|
2017-04-12 18:39:56 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
42a1026f9c
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-12 14:12:15 -07:00 |
|
|
gaba
|
e04f0f7070
|
Moves settings into the state for the stream. Adds premodlinks to the query.
|
2017-04-12 14:08:55 -07:00 |
|
|
gaba
|
cbde4cc8bc
|
Removes handleClick as it is working now with the changeTab (as the viewAllComments was added). /cc @kiwi
|
2017-04-12 11:58:41 -07:00 |
|
|
gaba
|
48795b29bf
|
Removes isAdmin for refetching when changing tabs.
|
2017-04-12 10:41:15 -07:00 |
|
|
gaba
|
f4f8e5053f
|
Remove the binding in the constructor.
|
2017-04-12 10:12:00 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
51774323de
|
Merge branch 'master' into 143520139-permalink-show-all
|
2017-04-12 10:10:17 -07:00 |
|
|
gaba
|
f900727455
|
Move the method to the class, changes name and removes wrapper.
|
2017-04-11 17:57:56 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
f44798361e
|
Merge branch 'master' into 143520139-permalink-show-all
|
2017-04-11 15:06:22 -07:00 |
|
|
gaba
|
56dedb551f
|
Adds click to showAll and refresh query to the '# comments' tab.
|
2017-04-11 15:02:04 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
295f4ddec2
|
Merge branch 'master' into ignore
|
2017-04-11 14:26:53 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
152a9417b2
|
Merge branch 'master' into plugin_examples
|
2017-04-11 13:56:27 -07:00 |
|
|
gaba
|
c5520e3fb6
|
Adds missing template.
|
2017-04-11 12:22:05 -07:00 |
|
|
gaba
|
a7493af979
|
Fix search box in Community Admin.
|
2017-04-11 11:58:19 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
155be523ff
|
Merge branch 'master' into community-flags
|
2017-03-28 07:14:30 -07:00 |
|
|
gaba
|
a6fa9a22c3
|
It refresh the page after editing name.
|
2017-03-24 13:57:10 -07:00 |
|
|
gaba
|
a2551a499f
|
Adds a few more font-sizes.
|
2017-03-24 12:58:45 -07:00 |
|
|
gaba
|
680919dd0e
|
Making more sense.
|
2017-03-24 11:53:51 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
c51a4ff228
|
Merge branch 'master' into translations
|
2017-03-24 11:33:16 -07: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 |
|
|
gaba
|
323749915a
|
CSS alignments
|
2017-03-24 08:59:43 -07: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 |
|
|
gaba
|
b9c816285d
|
Fix params for moduserflaggedquery.
|
2017-03-23 14:48:15 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
849be3d5fd
|
Merge branch 'master' into translations
|
2017-03-22 17:31:28 -07:00 |
|
|
gaba
|
35c8e1b5f9
|
Check spanish translations
|
2017-03-22 17:27:43 -07:00 |
|
|
gaba
|
4cbd6ebad2
|
Mooore translations.
|
2017-03-22 16:21:40 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
ae96cb1e44
|
Merge branch 'master' into my-comments-ux
|
2017-03-22 16:18:45 -07:00 |
|
|
gaba
|
27a8c994a8
|
Fixing more translations
|
2017-03-22 13:19:08 -07:00 |
|
|
gaba
|
78e7951ad7
|
Merge branch 'master' into translations
|
2017-03-22 12:11:52 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
82068cd20e
|
Merge pull request #370 from coralproject/story-138187767-mod-flag-names
Story 138187767 - Moderate Flag User Names
|
2017-03-22 12:10:43 -07:00 |
|
|
gaba
|
72e714a42c
|
Translations into json
|
2017-03-22 11:59:33 -07:00 |
|
|
gaba
|
54015691fe
|
Merge branch 'master' into translations
|
2017-03-22 11:46:09 -07:00 |
|
|
gaba
|
d9af09d2a3
|
Email templates
|
2017-03-22 11:43:03 -07:00 |
|
|
gaba
|
046cea5043
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-22 11:33:25 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
d7ccfa4eda
|
Merge pull request #431 from coralproject/remove-express-dep
remove express dep from mailer service
|
2017-03-22 11:32:36 -07:00 |
|
|
gaba
|
ac6a116896
|
Only the name for the template.
|
2017-03-22 11:21:41 -07:00 |
|
|
gaba
|
9782cf0b9d
|
Mail SendSimple will not use app in the future but render from ejs.
|
2017-03-22 10:02:59 -07:00 |
|
|
gaba
|
7522bd9cd6
|
Sends a mail to the suspended user.
|
2017-03-21 15:08:46 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
b9960c3cc7
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-21 10:42:48 -07:00 |
|
|
gaba
|
a09d41053f
|
It uses Button instead of FabButton from coral-ui.
|
2017-03-21 10:36:21 -07:00 |
|
|
gaba
|
e5bac88bb5
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-20 15:02:38 -07:00 |
|
|
gaba
|
be2ecf0838
|
Adds user and message to flagaction to display in FE.
|
2017-03-20 13:38:11 -07:00 |
|
|
gaba
|
9e76ca5d27
|
Fix CSS.
|
2017-03-20 12:37:21 -07:00 |
|
|
gaba
|
ac8c73c4e9
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-20 10:47:04 -07:00 |
|
|
gaba
|
2fff47c753
|
Merge branch 'master' into plugins
|
2017-03-20 10:46:30 -07:00 |
|
|
gaba
|
2a66a78d41
|
Merge branch 'master' into recaptcha-support
|
2017-03-20 10:37:18 -07:00 |
|
|
gaba
|
a2833538a7
|
move CountdownTimer to its own component
|
2017-03-20 10:26:12 -07:00 |
|
|
gaba
|
7232d09eb3
|
Merge branch 'master' into remove-like-widget
|
2017-03-20 07:47:37 -07:00 |
|
|
gaba
|
a71b8a4ae4
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-20 07:41:12 -07:00 |
|
|
gaba
|
6f3cb34817
|
Merge branch 'master' into asset-comment-metrics
|
2017-03-20 07:39:00 -07:00 |
|
|
gaba
|
258fd8b25a
|
Initial implementation at plugins
|
2017-03-20 07:36:06 -07:00 |
|
|
gaba
|
be351e46fd
|
Merge branch 'master' into bugfix-ban-dialog-language
|
2017-03-20 07:32:06 -07:00 |
|
|
gaba
|
b2234bc3c9
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/containers/Dashboard/Widget.css
|
2017-03-20 07:28:17 -07:00 |
|
|
gaba
|
ff71908a10
|
Merge branch 'master' into mod-queue-load-more
|
2017-03-20 07:26:00 -07:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
491694b9c1
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-09 17:20:00 +01:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
dae2e7d9d6
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-08 20:09:50 +01:00 |
|
|
gaba
|
69916a6ef2
|
I could not figure out how to send the parameter to the graphql query through the client.
|
2017-03-08 19:39:28 +01:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
0b280d0de2
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 19:12:45 +01:00 |
|
|
gaba
|
f8bc1037d2
|
Adds the reason.
|
2017-03-07 18:36:27 +01:00 |
|
|
gaba
|
62423e620e
|
Remove edge on user.
|
2017-03-07 18:04:50 +01:00 |
|
|
gaba
|
54354c3cc6
|
Translation.
|
2017-03-07 16:27:12 +01:00 |
|
|
gaba
|
564b8d8eaa
|
Merge branch 'master' into story-138187767-mod-flag-names
|
2017-03-07 13:04:28 +01:00 |
|
|
gaba
|
d06a5d37f0
|
Moves to the loader and work on the user query to add pagination and action type.
|
2017-03-07 07:29:32 +01:00 |
|
|
gaba
|
0fe456f574
|
Fix suspend button.
|
2017-03-02 16:43:52 -08:00 |
|
|
gaba
|
2fa832a3f4
|
adds suspendUser func and mutation.
|
2017-03-02 15:54:50 -08:00 |
|
|
gaba
|
1899dcbb7e
|
Suspend User dialog.
|
2017-03-02 09:27:53 -08:00 |
|
|
gaba
|
3626d2678e
|
Accept button working. Add suspend user dialog.
|
2017-03-01 23:43:25 -08:00 |
|
|
gaba
|
acc9b2d9bf
|
Approve and Reject buttons. Still misssing suspending
|
2017-03-01 14:21:49 -08:00 |
|
|
gaba
|
f5ef33d24e
|
Ban Button with graphql mutation.
|
2017-03-01 12:57:12 -08:00 |
|
|
gaba
|
6dfd3fc4ef
|
Fix the people tag.
|
2017-02-28 22:10:14 -08:00 |
|
|
gaba
|
da3c812dc1
|
Adds graphql for users flagged in the server and client.
|
2017-02-28 21:33:01 -08:00 |
|
|
Gabriela Rodríguez BerónandGitHub
|
1db68a12a8
|
Merge branch 'master' into whizard-whitelist
|
2017-02-28 09:54:39 -08:00 |
|