wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-13 13:59:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,400 Commits 10 Branches 125 Tags
743327a53b537669482ff89cdfa1aea8a2dcf6d4
Commit Graph

9400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jero 878cbb9195 Added email.password_reset.subject translation 2018-04-26 18:35:45 -03:00
Kim Gardner 2d6a6d652e Merge pull request #1545 from conversario/popupmenu-style 
Decrease font-size and padding in Report comment popup
 2018-04-26 13:36:26 -04:00
Kim Gardner 287d0bf538 Merge branch 'master' into popupmenu-style 2018-04-26 12:47:56 -04:00
Fabian Neumann 8643b1fbf2 Decrease font-size and padding in Flag Comment popup a bit. 2018-04-26 17:52:03 +02:00
Kim Gardner dd9a9d5882 Remove refs to talk-plugin-profile-settings 2018-04-25 15:30:40 -04:00
Kim Gardner 2048a2cc7f Merge pull request #1541 from coralproject/docs-formatting 
Small docs fix
 2018-04-25 12:33:47 -04:00
Belén Curcio 358d56c2cf Merge branch 'master' into docs-formatting 2018-04-25 13:10:55 -03:00
Belén Curcio 6376fe21cb Merge pull request #1542 from coralproject/grammar-fixes 
Use email vs e-mail
 2018-04-25 13:10:29 -03:00
Kim Gardner 2bc6687957 Use email vs e-mail 2018-04-25 11:09:54 -04:00
Kim Gardner 3bd2d0b3fc Small fix 2018-04-24 17:17:57 -04:00
Kim Gardner d483b13aa8 Merge pull request #1539 from clintabrown/fix-cli-user-create 
Fix CLI users create task
 2018-04-24 14:12:08 -04:00
Kim Gardner 47a860c09d Merge branch 'master' into fix-cli-user-create 2018-04-24 13:07:38 -04:00
Kim Gardner 7f506f3fea Merge pull request #1532 from coralproject/gdpr-password 
[GDPR] Password Change
 2018-04-24 12:55:14 -04:00
okbel f910d7023c Merge branch 'master' of github.com:coralproject/talk into gdpr-password 
* 'master' of github.com:coralproject/talk:
  Fix typo
  added direct download mutation
  adjusted download to include all comments
 2018-04-24 13:43:24 -03:00
okbel 37919a11ab Adding a notification after saving 2018-04-24 13:39:13 -03:00
Clint Brown f83d6246cb Fix lint 2018-04-24 17:34:14 +10:00
Clint Brown ea96b7b7ce Merge branch 'master' into fix-cli-user-create 2018-04-24 17:23:57 +10:00
Clint Brown a444d98733 Add missing ctx arg for CLI users create 2018-04-24 17:17:48 +10:00
okbel eaf0df9573 final refactor, done. 2018-04-24 00:45:51 -03:00
okbel 5e3fc2b22a Adding translations, en, es, more 2018-04-24 00:20:10 -03:00
okbel 1d2be0cef0 Validation finished 2018-04-23 23:56:54 -03:00
okbel 493c4689c2 as InputField 2018-04-23 23:34:16 -03:00
Kim Gardner 51e4bcfef9 Merge pull request #1493 from coralproject/gdpr-download 
[GDPR] Download My Comments
 2018-04-23 14:39:18 -04:00
okbel 76ede5c541 fix for large icons, reorder of styles 2018-04-23 15:32:21 -03:00
okbel f4f0400c4d Merge branch 'gdpr-password' of github.com:coralproject/talk into gdpr-password 
* 'gdpr-password' of github.com:coralproject/talk:
  Renamed nl to nlTA. Sorted ta.register calls
  Added NL translation for Moment. Also, sorted locale imports alphabetically.
 2018-04-23 15:23:14 -03:00
okbel 9bb3a9f7cb changes 2018-04-23 15:22:50 -03:00
Kim Gardner 89711b2010 Merge branch 'master' into gdpr-password 2018-04-23 12:07:52 -04:00
Kim Gardner 61ec6c886c Merge branch 'master' into gdpr-download 2018-04-23 11:00:53 -04:00
Kim Gardner 6dd0dd41e0 Merge pull request #1535 from sanoma/master 
Fix Dutch locale for Moment.JS
 2018-04-23 11:00:38 -04:00
Kim Gardner c936a6ff2c Fix typo 2018-04-23 10:59:23 -04:00
D. Luijten 18e8f9c3dc Merge branch 'hotfix/fix_dutch_moment_locale' 
* hotfix/fix_dutch_moment_locale:
  Renamed nl to nlTA. Sorted ta.register calls
 2018-04-23 16:47:08 +02:00
D. Luijten c103a0c481 Renamed nl to nlTA. 
Sorted ta.register calls
 2018-04-23 16:46:42 +02:00
okbel 21f942a219 validations 2018-04-23 11:43:40 -03:00