okbel
bb9be71a7a
Merge branch 'gdpr-change-email-bug' of github.com:coralproject/talk into gdpr-change-email-bug
...
* 'gdpr-change-email-bug' of github.com:coralproject/talk:
Remove unused variable 2
Remove unused variable
Remove ModerationIndicator from container
Show username already exists error
No indicator on new queue
Exclude deleted when loading more
Remove modqueue counts on the frontend
2018-05-15 12:07:15 -03:00
okbel
50acf9ca50
Removing
2018-05-15 11:47:07 -03:00
Kim Gardner
3ae0136f75
Merge branch 'master' into gdpr-change-email-bug
2018-05-14 17:59:16 -04:00
Wyatt Johnson
32510db1fa
Merge pull request #1618 from coralproject/remove-mod-count-frontend
...
Remove modqueue counts on the frontend
2018-05-14 14:52:43 -06:00
Wyatt Johnson
83fddfdc40
Merge branch 'master' into remove-mod-count-frontend
2018-05-14 14:36:42 -06:00
Kim Gardner
ed32a69b68
Merge branch 'master' into gdpr-change-email-bug
2018-05-14 16:32:51 -04:00
Kim Gardner
02b1e03c21
Merge pull request #1620 from coralproject/username-already-exists
...
Show username already exists error
2018-05-14 16:29:19 -04:00
Chi Vinh Le
08d523a4d6
Remove unused variable 2
2018-05-14 21:38:30 +02:00
Chi Vinh Le
b5adea4b2a
Remove unused variable
2018-05-14 21:30:09 +02:00
Chi Vinh Le
beef4e8b3b
Remove ModerationIndicator from container
2018-05-14 21:28:48 +02:00
Chi Vinh Le
5a190839d1
Show username already exists error
2018-05-14 20:44:30 +02:00
Chi Vinh Le
ab7e5bc858
No indicator on new queue
2018-05-14 20:05:18 +02:00
Chi Vinh Le
12e848aace
Exclude deleted when loading more
2018-05-14 19:27:18 +02:00
Chi Vinh Le
67c3fe3c5b
Remove modqueue counts on the frontend
2018-05-14 19:18:34 +02:00
okbel
1f7c4e58a1
sepatate state
2018-05-14 13:31:24 -03:00
Wyatt Johnson
f846ef0c06
Merge pull request #1595 from clintabrown/fix-my-profile-title-link
...
Fix My Profile story title link behavior
2018-05-11 14:37:23 -06:00
Wyatt Johnson
fa31541fb7
Merge branch 'master' into fix-my-profile-title-link
2018-05-11 14:13:29 -06:00
Wyatt Johnson
4fcd5dd4f7
Merge pull request #1604 from coralproject/email-attach-fix
...
Email Attach Fixes
2018-05-11 13:05:45 -06:00
Chi Vinh Le
7d8d5a6115
Use lodash get
2018-05-11 20:46:32 +02:00
Chi Vinh Le
f0dcd844a7
Fix excludeIf condition
2018-05-11 20:44:45 +02:00
Wyatt Johnson
9a1b9fb864
Merge branch 'master' into email-attach-fix
2018-05-11 11:39:08 -06:00
Wyatt Johnson
6cf4203c9b
Update translations.yml
2018-05-11 11:38:54 -06:00
Kiwi
85e21f8090
Merge pull request #1606 from coralproject/ios-focus-zoom-issues
...
Disable autofocus on IOS Safari, prevent zoom on narrow screens
2018-05-11 14:31:21 -03:00
Chi Vinh Le
64583fabbe
Merge branch 'email-attach-fix' of ssh://github.com/coralproject/talk into email-attach-fix
2018-05-11 18:40:26 +02:00
Kiwi
bdaf5c633e
Merge branch 'master' into email-attach-fix
2018-05-11 13:40:00 -03:00
Kiwi
945e2670f5
Merge branch 'master' into ios-focus-zoom-issues
2018-05-11 13:39:52 -03:00
Kiwi
4166e36e1e
Merge pull request #1599 from coralproject/css-templates
...
CSS and Template Fixes + Improvements
2018-05-11 13:39:36 -03:00
Chi Vinh Le
f018ccf33e
Prevent showing add email address dialog when usernam is not set
2018-05-11 18:38:41 +02:00
Belén Curcio
e61f325e86
Merge branch 'master' into fix-my-profile-title-link
2018-05-11 13:36:12 -03:00
Wyatt Johnson
ef72b7b1d5
Merge branch 'master' into email-attach-fix
2018-05-11 10:33:32 -06:00
okbel
a571cf830d
Adding target
2018-05-11 13:32:55 -03:00
Kiwi
5dea051427
Merge branch 'master' into css-templates
2018-05-11 13:25:52 -03:00
Kim Gardner
730ef1a5c4
Merge pull request #1608 from mkonikov/copy-fix
...
Update download page copy
2018-05-11 12:25:39 -04:00
Belén Curcio
622b79b491
Removing unnecessary functions
2018-05-11 13:22:48 -03:00
Wyatt Johnson
faa0ee8ceb
added global wrap
2018-05-11 10:22:45 -06:00
Kiwi
d67c25a791
Merge branch 'master' into email-attach-fix
2018-05-11 13:21:20 -03:00
Belén Curcio
32d615527a
Merge branch 'master' into fix-my-profile-title-link
2018-05-11 13:08:13 -03:00
Wyatt Johnson
3a9051bf1b
Merge branch 'master' into css-templates
2018-05-11 10:07:59 -06:00
Kim Gardner
44c2d7847a
Merge branch 'master' into copy-fix
2018-05-11 11:55:53 -04:00
Kiwi
93359d8250
Merge pull request #1613 from coralproject/wyattjoh-patch-1
...
Delete package-lock.json
2018-05-11 12:37:28 -03:00
Wyatt Johnson
ba2985e891
Merge branch 'master' into email-attach-fix
2018-05-11 09:33:55 -06:00
Wyatt Johnson
42d4abf842
review updates
2018-05-11 09:33:29 -06:00
Wyatt Johnson
29ffe287cd
Delete package-lock.json
2018-05-11 09:21:55 -06:00
Kiwi
05c13126ad
Merge branch 'master' into ios-focus-zoom-issues
2018-05-11 12:21:15 -03:00
Kim Gardner
787dd8ec8a
Merge branch 'master' into copy-fix
2018-05-11 11:18:22 -04:00
Kim Gardner
47c7125190
Merge pull request #1612 from mkonikov/capitalize
...
Capitalize "Information"
2018-05-11 11:17:29 -04:00
Chi Vinh Le
fc5621a060
Add reference to story
2018-05-11 17:12:28 +02:00
Mendel Konikov
f57f8397fe
Capitalize "Information"
2018-05-11 11:01:15 -04:00
Mendel Konikov
2d1b675234
Update download page copy
2018-05-10 21:01:26 -04:00
Kim Gardner
ac7bea209e
Merge branch 'master' into email-attach-fix
2018-05-10 18:53:39 -04:00