Commit Graph

9209 Commits

Author SHA1 Message Date
okbel 4e63cff57f Merge branch 'autocomplete-off' of github.com:coralproject/talk into autocomplete-off
* 'autocomplete-off' of github.com:coralproject/talk:
  updated version
  FrenchCorrections
  New version of the translation
  added missing translations
  add missing strings in fr locale
  Add Finnish translation
2018-04-12 12:18:53 -03:00
okbel 0206804bf4 autocapitalize off for the username field 2018-04-12 12:18:22 -03:00
Wyatt Johnson 4dfc90cac4 Merge branch 'master' into autocomplete-off 2018-04-11 11:09:52 -06:00
Wyatt Johnson 46078117c8 updated version v4.3.1 2018-04-10 12:05:59 -06:00
Wyatt Johnson 879820d340 Merge pull request #1515 from cecilebertin/MissingFrench
Missing french translations
2018-04-10 11:13:51 -06:00
Wyatt Johnson 88d9cd193b Merge branch 'master' into MissingFrench 2018-04-10 10:57:30 -06:00
Wyatt Johnson 624d768f38 Merge pull request #1511 from almamedia/master
Finnish translation
2018-04-10 10:57:05 -06:00
cecile 254033a294 FrenchCorrections 2018-04-10 09:40:22 -07:00
Wyatt Johnson 637630b8dd Merge branch 'master' into master 2018-04-10 10:27:59 -06:00
Ville Kauppi 80987a1e46 New version of the translation 2018-04-10 13:21:52 +03:00
cecile e9e70f7e75 added missing translations 2018-04-09 21:20:23 -07:00
cecile ffde113a74 add missing strings in fr locale 2018-04-09 17:53:07 -07:00
okbel 3fcad35492 autocomplete off 2018-04-09 16:27:02 -03:00
Wyatt Johnson aef096fa4c Merge pull request #1510 from coralproject/asset-scrape-fix
Asset Scraping CLI Fix
2018-04-09 09:10:58 -06:00
Ville Kauppi a6518b183f Add Finnish translation 2018-04-08 15:05:49 +03:00
Wyatt Johnson 93ccec6614 Fixes #1505 2018-04-06 16:19:10 -06:00
Wyatt Johnson 691e0f5256 Merge pull request #1492 from coralproject/docs
Docs cleanup
2018-04-06 16:08:14 -06:00
Wyatt Johnson 0e1ace115e Merge branch 'master' into docs 2018-04-06 15:24:17 -06:00
Wyatt Johnson ae361d5110 Merge pull request #1509 from coralproject/safari-auth
Safari External Auth
2018-04-06 15:24:05 -06:00
Belén Curcio cfe5b12abd Merge branch 'master' into safari-auth 2018-04-06 17:56:30 -03:00
Wyatt Johnson 1e2c224204 Merge branch 'master' into docs 2018-04-06 13:52:06 -06:00
Wyatt Johnson fbe2ec30aa Merge pull request #1498 from coralproject/#156312019
Admin Settings: Save and discard changes / Routes
2018-04-06 13:37:39 -06:00
Belén Curcio 2f7f6f4f53 Merge branch 'master' into #156312019 2018-04-05 17:27:44 -03:00
okbel f77493afb1 Merge branch '#156312019' of github.com:coralproject/talk into #156312019
* '#156312019' of github.com:coralproject/talk:
  IfSlotIsNotEmpty Bug
  allow plugin code from clients to be parsed by webpack
  Restore Links
  fix install buttons - making the click area bigger
  Scraper improvements
2018-04-05 17:25:30 -03:00
okbel 793b473681 PropTypes 2018-04-05 17:25:00 -03:00
okbel ad56d3b99a Removin actions, using routes, and continuing the transition when the user makes an action 2018-04-05 17:24:11 -03:00
Wyatt Johnson e6b8cd3220 fixes related to external auth 2018-04-05 14:19:11 -06:00
Wyatt Johnson 98725fcb19 Merge pull request #1506 from coralproject/slot-bug
Slot Bug - commentContent should only render one plugin
2018-04-05 11:38:35 -06:00
Wyatt Johnson ee163af833 Merge branch 'master' into slot-bug 2018-04-05 11:19:59 -06:00
Wyatt Johnson 8ec933e844 Merge branch 'master' into #156312019 2018-04-04 09:32:48 -06:00
Wyatt Johnson 13f81ad819 Merge pull request #1500 from coralproject/restore-links
Restore Links of old comments when using RTE
2018-04-04 09:32:26 -06:00
Wyatt Johnson 8d185fe309 Merge branch 'master' into restore-links 2018-04-04 09:24:29 -06:00
okbel edbe49618a Adding size, and proptypes 2018-04-03 20:17:31 -03:00
Wyatt Johnson 2ec7b53cea Merge pull request #1503 from coralproject/if-slot-not-empty
IfSlotIsNotEmpty Bug
2018-04-03 13:04:15 -06:00
okbel c448d8d2cd Merge branch '#156312019' of github.com:coralproject/talk into #156312019
* '#156312019' of github.com:coralproject/talk:
  Removing plugin
  Removing plugin
  renaming slot :D
  renaming
  Remaining rename
  Give descriptive key for slot elements and use it instead of talkPluginName
  Styling
  adding it back
  re entering
  Ignoring
  with hasBlockers
  changes
  Styling and translations
  Adding checkbox, working on the translations
  wip
  Working on containers
  Removing styles from sign in
2018-04-03 10:23:12 -03:00
Wyatt Johnson fb3233cf01 IfSlotIsNotEmpty Bug 2018-04-02 17:01:49 -06:00
Kim Gardner 30c38fa696 Merge branch 'master' into restore-links 2018-04-02 18:25:34 -04:00
okbel e4358ac3a1 Style and translations 2018-04-02 16:09:47 -03:00
Wyatt Johnson de6f325204 Merge pull request #1502 from coralproject/webpack-plugins
Webpack and client plugins
2018-04-02 12:55:45 -06:00
Wyatt Johnson 13667deaed Merge branch 'master' into webpack-plugins 2018-04-02 12:44:56 -06:00
Kim Gardner 610bf36947 Merge branch 'master' into restore-links 2018-04-02 14:44:01 -04:00
Kim Gardner 126d55e6d8 Merge pull request #1494 from coralproject/fix-install
Fix install buttons
2018-04-02 14:43:27 -04:00
Wyatt Johnson 6f0af18619 Merge branch 'master' into webpack-plugins 2018-04-02 12:27:41 -06:00
Wyatt Johnson 3da201c22d allow plugin code from clients to be parsed by webpack 2018-04-02 12:25:18 -06:00
Kim Gardner 5ae9d719f3 Merge branch 'master' into fix-install 2018-04-02 13:43:42 -04:00
Kim Gardner 91bce6c74a Merge pull request #1481 from coralproject/scraper
Scraper improvements
2018-04-02 13:43:33 -04:00
Kim Gardner 232ed4f4ef Merge branch 'master' into restore-links 2018-04-02 13:42:32 -04:00
Belén Curcio 7720f1d178 Merge branch 'master' into #156312019 2018-04-02 14:38:21 -03:00
Kim Gardner 533cd3217d Merge branch 'master' into fix-install 2018-04-02 13:37:12 -04:00
okbel d16ce17e36 SaveChangesDialog 2018-04-02 14:35:09 -03:00