Commit Graph

9181 Commits

Author SHA1 Message Date
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 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
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
Kim Gardner e8026afb41 Merge branch 'master' into scraper 2018-04-02 13:34:24 -04:00
okbel 81509b660e Spanish translations 2018-04-02 14:19:25 -03:00
okbel 4ed04d1c39 Adding translations 2018-04-02 14:12:02 -03:00
okbel 17e90b0313 Merge branch '#156312019' of github.com:coralproject/talk into #156312019
* '#156312019' of github.com:coralproject/talk:
  Add back missing tutorial
2018-04-02 13:50:06 -03:00
okbel a509405f43 alert route hook ready! 2018-04-02 13:33:50 -03:00
Kim Gardner 3d61713f16 Merge pull request #1484 from coralproject/terms-and-conditions
Terms and conditions
2018-04-02 12:17:11 -04:00
Belén Curcio 56987bdcd6 Merge branch 'master' into #156312019 2018-04-02 12:50:47 -03:00
okbel 24c1abaa06 Removing plugin 2018-03-30 16:05:25 -03:00
Chi Vinh Le fe75d9543c Restore Links 2018-03-30 20:12:10 +02:00
okbel 681f9ecf5a Removing plugin 2018-03-30 14:39:16 -03:00
okbel 394ebb8f2d Save changes / discard changes dialohg 2018-03-30 12:18:57 -03:00
okbel 6982509233 router and state lifted 2018-03-30 12:00:50 -03:00
okbel 06b64ad250 routes 2018-03-30 10:55:15 -03:00
okbel 9cc089b3b2 renaming slot :D 2018-03-30 10:37:42 -03:00
okbel ae674a4e62 Merge branch 'terms-and-conditions' of github.com:coralproject/talk into terms-and-conditions
* 'terms-and-conditions' of github.com:coralproject/talk: (136 commits)
  Remaining rename
  Give descriptive key for slot elements and use it instead of talkPluginName
  Add back missing tutorial
  removed unused plugin from directory
  expanded fix to staff replies
  Fix notification responsiveness
  Profile my comments responsive fixes
  Notification fixes
  Remove italic styling from blockquote
  Better disabled detection
  Disable hover on touch devices
  docs update
  Let browser insert text
  Support nested feature instance
  Rename buttons to feature
  Add classNames for styling
  Shortcut support
  Fix append new line after node..
  Better selection behavior
  Remove all unwanted style attr
  ...
2018-03-30 10:36:33 -03:00
okbel ec117a67aa renaming 2018-03-30 10:35:49 -03:00
Chi Vinh Le f32c9fa6b1 Remaining rename 2018-03-29 22:51:40 +02:00
Chi Vinh Le 761e372016 Give descriptive key for slot elements and use it instead of talkPluginName 2018-03-29 22:47:27 +02:00
okbel 8d147c9e7b Styling 2018-03-29 13:27:35 -03:00
Belén Curcio 4a4c502fdd Merge branch 'master' into terms-and-conditions 2018-03-29 11:20:01 -03:00
okbel bfea8b00e1 adding it back 2018-03-29 11:18:29 -03:00
okbel 94dbfd6802 re entering 2018-03-29 11:15:48 -03:00
okbel c5dc8454a2 Ignoring 2018-03-29 11:15:34 -03:00
okbel ff9a212cfb with hasBlockers 2018-03-29 11:10:22 -03:00
okbel 0b3b252fc3 changes 2018-03-29 10:56:18 -03:00
Kim Gardner 6f616a1e78 Merge branch 'master' into scraper 2018-03-28 09:18:11 -04:00
Belén Curcio 3a436bd530 Merge branch 'master' into fix-install 2018-03-28 10:17:53 -03:00