Commit Graph
100 Commits
Author SHA1 Message Date
Kim GardnerandGitHub 810cb222f9 Merge branch 'master' into es-translations 2018-05-04 15:48:56 -04:00
Jero 7a7dcdd7c6 corrections in spanish translations 2018-05-04 16:35:24 -03:00
okbel bfb4b790d4 Adding error 2018-05-02 16:49:56 -03:00
Kim Gardner 4212f0b014 Update copy 2018-04-30 18:22:35 -04:00
Kim GardnerandGitHub 1143f74ba8 Merge branch 'master' into password_reset-subject-translation 2018-04-30 12:58:54 -04:00
Jero 878cbb9195 Added email.password_reset.subject translation 2018-04-26 18:35:45 -03:00
Jero b8d435fb07 Added missing spanish translations 2018-04-26 18:29:25 -03:00
Kim GardnerandGitHub 31a8de852c Merge branch 'master' into organization-contact 2018-04-18 17:01:13 -04:00
Kim GardnerandGitHub 3e8abf554e Merge branch 'master' into 155910162 2018-04-18 15:35:21 -04:00
okbel 1ceb1b4014 Save, and edit changes 2018-04-10 11:46:32 -03:00
okbel 91aa95d3f2 Merge branch 'master' of github.com:coralproject/talk into organization-contact
* 'master' of github.com:coralproject/talk: (36 commits)
  Fixes #1505
  PropTypes
  Removin actions, using routes, and continuing the transition when the user makes an action
  fixes related to external auth
  Adding size, and proptypes
  IfSlotIsNotEmpty Bug
  Style and translations
  allow plugin code from clients to be parsed by webpack
  SaveChangesDialog
  Spanish translations
  Adding translations
  alert route hook ready!
  Removing plugin
  Restore Links
  Removing plugin
  Save changes / discard changes dialohg
  router and state lifted
  routes
  renaming slot :D
  renaming
  ...
2018-04-09 16:51:06 -03:00
okbel 1a39727e38 account history to user history 2018-04-03 10:29:07 -03:00
okbel e4358ac3a1 Style and translations 2018-04-02 16:09:47 -03:00
okbel 81509b660e Spanish translations 2018-04-02 14:19:25 -03:00
okbel 6c815c1132 Working on the admin side 2018-03-28 10:39:50 -03:00
okbel 6a22cd54ec Adding OrganizationDetails 2018-03-28 10:04:14 -03:00
okbel 480428b4a2 PropTypes and adding field 2018-03-28 09:44:02 -03:00
Chi Vinh Le 9ad92e38c0 Move profile settings to core 2018-03-13 17:48:54 +01:00
Kim Gardner 7e41619732 Update new translation keys 2018-02-23 14:54:45 -05:00
Chi Vinh Le c7ee8307e6 Merge branch 'master' into auth-refactor 2018-02-13 16:33:17 +01:00
Chi Vinh Le 87af05c0d9 Fix translations 2018-02-13 15:33:50 +01:00
Kim Gardner afe411515d Add suspend error message 2018-02-12 17:26:40 -05:00
Kim Gardner 408a082f2d Update Spanish 2018-02-08 17:12:16 -05:00
Kim Gardner 18cc8b9389 Update stream.comment_not_found text 2018-02-08 11:28:21 -05:00
Kim Gardner 0507e750b9 Update translations 2018-01-25 15:00:34 -05:00
Wyatt Johnson 45d4c79c26 added reply bug 2018-01-16 12:30:38 -07:00
okbel 570c0edfb3 merge conficts 2017-12-20 16:06:55 -03:00
Kim Gardner 82fd56dc67 Update permalink copy to Share on stream 2017-12-18 13:09:39 -05:00
Wyatt Johnson 2d70caf03d Merge branch 'next' into user-status-refactor 2017-12-04 15:42:57 -07:00
Wyatt Johnson 419784f6d1 Merge branch 'master' into next 2017-12-04 15:28:41 -07:00
Kim Gardner 64276cd157 Remove Dashboard 2017-11-30 23:20:01 +00:00
Belen Curcio c177403628 Merge branch 'user-status-refactor' of github.com:coralproject/talk into user-status-refactor 2017-11-28 14:37:50 -03:00
Belen Curcio b7704fb2ca Translations and Styling 2017-11-28 14:37:23 -03:00
Wyatt JohnsonandGitHub 2437401daf Merge branch 'next' into user-status-refactor 2017-11-28 09:47:34 -07:00
Wyatt JohnsonandGitHub 7f189cd4d4 Merge branch 'master' into next 2017-11-28 09:47:21 -07:00
Belen Curcio 16e3924d3f Ban user dialog steps 2017-11-28 13:39:49 -03:00
Belen Curcio d510905ba2 Adding ban message and setRole 2017-11-28 00:18:09 -03:00
Kim Gardner 12e61bbc66 Update suspend copy 2017-11-20 19:41:14 +00:00
Wyatt Johnson 61df0e1eeb Merge branch 'master' into next 2017-11-08 13:49:21 -07:00
Belen Curcio 7494752019 Translations, Proptypes, NoComments Component 2017-10-19 11:20:09 -03:00
Belen Curcio c98cb02a4a Adding dropdown to ViewOptions 2017-10-12 13:52:17 -03:00
Kim GardnerandGitHub d6e7bb0a0a Merge branch 'master' into flags-locales 2017-10-10 13:08:19 +01:00
Belen Curcio 16847f9fec Translations and PropTypes 2017-10-10 02:48:12 -03:00
Gerardo Galvez e4ff48ea88 Merge branch 'moderate-shortcuts' of https://github.com/gerardogalvez/talk into moderate-shortcuts 2017-10-06 20:20:48 -05:00
Gerardo Galvez cbd7337dbc Add spanish translations and cleaner way to get the activeTabIndex 2017-10-06 20:19:30 -05:00
Wyatt JohnsonandGitHub 970a93360a Merge branch 'master' into flags-locales 2017-10-06 11:04:27 -06:00
Rishabh04-02 b3486ce614 displaying time in X minutes Y seconds 2017-10-05 10:48:12 +05:30
Wyatt Johnson 2b08ef5c42 updated translations 2017-10-04 11:08:34 -06:00
Chi Vinh Le d3d7f909d8 Translations 2017-10-02 22:22:00 +07:00
Belen Curcio edd3e7f6fe More copuy 2017-09-21 09:20:15 -03:00