Commit Graph

9493 Commits

Author SHA1 Message Date
okbel 3b2deeb007 Checking if email verification is required 2018-05-02 18:35:15 -03:00
okbel b04fc1faf8 wip 2018-05-02 18:15:04 -03:00
okbel bfb4b790d4 Adding error 2018-05-02 16:49:56 -03:00
okbel c7db780582 Updating the cache with data from the fragment 2018-05-02 16:46:20 -03:00
Wyatt Johnson c1492d1065 Added incorrect password error 2018-05-02 13:22:15 -06:00
Wyatt Johnson 0159918049 docs updates 2018-05-02 13:04:17 -06:00
Kim Gardner cb9b02c180 remove profile-settings from gitignore 2018-05-02 14:20:19 -04:00
okbel c8e5678c9c Using fragments :) 2018-05-02 14:18:40 -03:00
okbel 48a78735bd Importing translations 2018-05-02 14:11:11 -03:00
okbel 8dcaf8ea4c Moving the translations too 2018-05-02 14:08:29 -03:00
okbel 780bd42ceb Moving gdpr to talk-plugin-local-auth 2018-05-02 13:49:23 -03:00
okbel b2f37733e8 Sending correct parameters 2018-05-02 13:39:08 -03:00
okbel 6c0c76328f merge conflict 2018-05-02 13:28:03 -03:00
Kim Gardner 72ca9b38bb Merge branch 'master' into gdpr-email 2018-05-02 11:21:11 -04:00
Kim Gardner 9dc040f6d2 Merge pull request #1560 from mkonikov/rich-text-docs
Add note explaining possible plugin conflict
2018-05-02 11:13:10 -04:00
Mendel Konikov 018addc6ad Remove space to correct markdown link formatting 2018-05-01 20:37:42 -04:00
Mendel Konikov c3d01be0df Add note explaining possible plugin conflict 2018-05-01 20:34:42 -04:00
Kim Gardner 17a63c0bf9 Merge branch 'master' into gdpr-email 2018-05-01 17:50:27 -04:00
Kim Gardner a8dd1ec38b Merge pull request #1557 from coralproject/indexes
Index Creation Patch
2018-05-01 17:48:48 -04:00
Wyatt Johnson d12310026b Fixes to shema loading 2018-05-01 15:41:05 -06:00
Wyatt Johnson b014225b73 fixes for index creation 2018-05-01 12:02:39 -06:00
Kim Gardner 7717462300 Merge pull request #1555 from coralproject/configure-enh
Configure enhancements
2018-05-01 13:32:38 -04:00
Kim Gardner 06682225c8 Fix error message 2018-05-01 13:25:33 -04:00
Kim Gardner 3145411921 Merge branch 'master' into configure-enh 2018-05-01 13:23:14 -04:00
okbel bd21d9a1a1 fix b 2018-05-01 14:19:43 -03:00
Kim Gardner a12e7a0e90 Merge pull request #1533 from coralproject/gdpr-username
[GDPR] Username Change
2018-05-01 12:55:24 -04:00
Kim Gardner 9c809f99c5 Merge branch 'master' into gdpr-email 2018-05-01 12:51:05 -04:00
Kim Gardner 16a21a0562 Merge branch 'master' into gdpr-username 2018-05-01 12:42:12 -04:00
Chi Vinh Le e0dad39600 Merge branch 'configure-enh' of ssh://github.com/coralproject/talk into configure-enh 2018-05-01 18:14:34 +02:00
Chi Vinh Le 74821a4d4c Readd save dialog on section change 2018-05-01 18:14:07 +02:00
Kiwi 41b3245bf4 Merge branch 'master' into configure-enh 2018-05-01 17:58:56 +02:00
Kim Gardner 71cdd146fa Merge pull request #1554 from coralproject/change-config-tab-copy
Update copy for stream Configure tab
2018-05-01 11:39:33 -04:00
Chi Vinh Le 68b1670a55 Prevent reload or closing tab or window with pending data 2018-05-01 16:33:21 +02:00
Chi Vinh Le 2af3a94ce4 No dialog when switching sections 2018-05-01 16:29:40 +02:00
Chi Vinh Le fd3f5e5116 Cleanup leave hook 2018-05-01 16:19:47 +02:00
Chi Vinh Le e8cd938b65 Move next route out of state 2018-05-01 16:18:17 +02:00
Chi Vinh Le 9310a4734d Fix viewing/editing empty org contact email 2018-05-01 16:16:41 +02:00
Andrew Losowsky 8d1d96884e small wording change
changed 'Customize' for 'Change' (more plain English)
2018-05-01 09:08:58 -04:00
okbel bbd02dda81 Finished with crossed steps 2018-04-30 23:14:47 -03:00
okbel f5563c80b1 Merge branch 'gdpr-username' of github.com:coralproject/talk into gdpr-email
* 'gdpr-username' of github.com:coralproject/talk:
  ChangeUsername instead of setUsername
2018-04-30 22:04:18 -03:00
okbel 4cd7ad9c33 ChangeUsername instead of setUsername 2018-04-30 20:20:58 -03:00
okbel 227e52c16e Merge branch 'gdpr-username' of github.com:coralproject/talk into gdpr-email
* 'gdpr-username' of github.com:coralproject/talk:
  Adding translations
  Catching if username cant be updated
  fixes for tests
  fixed tests
  Fixed bug in mutation
2018-04-30 20:14:15 -03:00
okbel 5dbf379bde Merge branch 'gdpr-username' of github.com:coralproject/talk into gdpr-username
* 'gdpr-username' of github.com:coralproject/talk:
  fixes for tests
  fixed tests
2018-04-30 20:04:09 -03:00
okbel cdb392cd0e Adding translations 2018-04-30 20:03:01 -03:00
okbel ad342c4bb3 Catching if username cant be updated 2018-04-30 19:56:53 -03:00
Kim Gardner 4212f0b014 Update copy 2018-04-30 18:22:35 -04:00
Wyatt Johnson b42d325cb0 fixes for tests 2018-04-30 16:13:48 -06:00
Wyatt Johnson 7a0c9c85bc fixed tests 2018-04-30 15:59:35 -06:00
Wyatt Johnson 31f0cb12b3 Fixed bug in mutation 2018-04-30 15:43:12 -06:00
Wyatt Johnson 457f305062 Merge branch 'master' into gdpr-email 2018-04-30 14:10:52 -06:00