Commit Graph

9456 Commits

Author SHA1 Message Date
Kim Gardner 26b9dcdaa9 Merge branch 'master' into cli 2018-05-02 11:13:42 -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
Wyatt Johnson d6828c5ef4 cli fixes 2018-05-01 16:27:47 -06: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
Kim Gardner a12e7a0e90 Merge pull request #1533 from coralproject/gdpr-username
[GDPR] Username Change
2018-05-01 12:55:24 -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 4cd7ad9c33 ChangeUsername instead of setUsername 2018-04-30 20:20:58 -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
Kim Gardner b31b01bc50 Merge branch 'master' into gdpr-username 2018-04-30 16:01:58 -04:00
Kim Gardner 743327a53b Merge pull request #1543 from coralproject/remove-profile-settings-refs
Remove refs to talk-plugin-profile-settings
2018-04-30 16:01:35 -04:00
Wyatt Johnson ec8f42496d Merge branch 'master' into remove-profile-settings-refs 2018-04-30 13:21:04 -06:00
Wyatt Johnson a5f94360b3 Merge pull request #1546 from jerodb/plugin-auth-translation
Added translation for the talk-plugin-auth's password error
2018-04-30 13:18:46 -06:00
Belén Curcio dbb9686074 Merge branch 'master' into remove-profile-settings-refs 2018-04-30 14:45:14 -03:00
Kim Gardner 4e10a23ad0 Merge branch 'master' into plugin-auth-translation 2018-04-30 13:43:57 -04:00
Kim Gardner e48f07f4dd Merge pull request #1548 from jerodb/password_reset-subject-translation
Added translation for email's subject
2018-04-30 13:19:27 -04:00
Kim Gardner 1143f74ba8 Merge branch 'master' into password_reset-subject-translation 2018-04-30 12:58:54 -04:00
Kim Gardner bc5a045886 Merge pull request #1549 from jerodb/viewing-sorting-translations-es
Changed spanish translations for the viewing options list
2018-04-30 12:58:20 -04:00
Kim Gardner 4130ad5217 Merge branch 'master' into viewing-sorting-translations-es 2018-04-30 12:43:48 -04:00
Wyatt Johnson 1e8c3de221 Merge pull request #1550 from theel0ja/patch-1
nightwatchjs.org doesn't support HTTPS
2018-04-30 10:23:55 -06:00
Kim Gardner fdf5ca1d7a Merge branch 'master' into patch-1 2018-04-30 11:15:36 -04:00
Kim Gardner 612230ad0c Merge pull request #1551 from theel0ja/patch-2
fixed typo
2018-04-30 11:15:03 -04:00
Elias Ojala edbd21f25f fixed typo 2018-04-28 23:02:29 +03:00
Elias Ojala f42e9dab4c nightwatchjs.org doesn't support HTTPS 2018-04-28 12:27:15 +03:00
Jero 90c235d9d1 Added the password error translation 2018-04-27 10:52:38 -03:00
Jero 3dbe59fd27 Translation for talk-plugin-auth password_error added 2018-04-27 10:25:59 -03:00
Jero 885f186e39 added viewing and sorting spanish translations 2018-04-26 19:19:06 -03:00
Kim Gardner 12d48d6248 Merge branch 'master' into gdpr-username 2018-04-26 18:02:13 -04:00