f27c41b83c
Merge branch 'master' into 155836892
2018-04-08 21:18:46 -03:00
691e0f5256
Merge pull request #1492 from coralproject/docs
...
Docs cleanup
2018-04-06 16:08:14 -06:00
071942faca
Merge branch '155836892' of github.com:coralproject/talk into 155836892
...
* '155836892' of github.com:coralproject/talk:
updated yarn.lock
2018-04-06 18:40:56 -03:00
9bbcb6a073
wip - inconcistencies with cache, considering refetching
2018-04-06 18:39:23 -03:00
0e1ace115e
Merge branch 'master' into docs
2018-04-06 15:24:17 -06:00
ae361d5110
Merge pull request #1509 from coralproject/safari-auth
...
Safari External Auth
2018-04-06 15:24:05 -06:00
48bfc2699b
Merge branch 'master' of github.com:coralproject/talk into 155836892
...
* 'master' of github.com:coralproject/talk:
PropTypes
Removin actions, using routes, and continuing the transition when the user makes an action
Adding size, and proptypes
IfSlotIsNotEmpty Bug
Style and translations
SaveChangesDialog
Spanish translations
Adding translations
alert route hook ready!
Restore Links
Save changes / discard changes dialohg
router and state lifted
routes
2018-04-06 17:59:25 -03:00
ad214a8e76
Merge branch 'master' into 155836892
2018-04-06 17:56:49 -03:00
cfe5b12abd
Merge branch 'master' into safari-auth
2018-04-06 17:56:30 -03:00
1e2c224204
Merge branch 'master' into docs
2018-04-06 13:52:06 -06:00
fbe2ec30aa
Merge pull request #1498 from coralproject/#156312019
...
Admin Settings: Save and discard changes / Routes
2018-04-06 13:37:39 -06:00
d0652d0583
Merge branch 'master' into 155836892
2018-04-05 17:28:24 -03:00
2f7f6f4f53
Merge branch 'master' into #156312019
2018-04-05 17:27:44 -03:00
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
793b473681
PropTypes
2018-04-05 17:25:00 -03:00
ad56d3b99a
Removin actions, using routes, and continuing the transition when the user makes an action
2018-04-05 17:24:11 -03:00
e6b8cd3220
fixes related to external auth
2018-04-05 14:19:11 -06:00
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
ee163af833
Merge branch 'master' into slot-bug
2018-04-05 11:19:59 -06:00
0c6ee2fe99
updated yarn.lock
2018-04-05 10:33:38 -06:00
c29b12688c
Merge branch 'master' into 155836892
2018-04-05 10:30:53 -06:00
8ec933e844
Merge branch 'master' into #156312019
2018-04-04 09:32:48 -06:00
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
8d185fe309
Merge branch 'master' into restore-links
2018-04-04 09:24:29 -06:00
ccfa7aff5f
Merge branch 'master' into 155836892
2018-04-04 07:53:48 -03:00
0b6b85b2a5
Removing logs
2018-04-04 07:37:27 -03:00
a6a0b3e931
Removing reloads
2018-04-04 07:33:50 -03:00
06f8926964
Avoiding refetching
2018-04-04 07:25:47 -03:00
edbe49618a
Adding size, and proptypes
2018-04-03 20:17:31 -03:00
2ec7b53cea
Merge pull request #1503 from coralproject/if-slot-not-empty
...
IfSlotIsNotEmpty Bug
2018-04-03 13:04:15 -06:00
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
fb3233cf01
IfSlotIsNotEmpty Bug
2018-04-02 17:01:49 -06:00
30c38fa696
Merge branch 'master' into restore-links
2018-04-02 18:25:34 -04:00
e4358ac3a1
Style and translations
2018-04-02 16:09:47 -03:00
de6f325204
Merge pull request #1502 from coralproject/webpack-plugins
...
Webpack and client plugins
2018-04-02 12:55:45 -06:00
13667deaed
Merge branch 'master' into webpack-plugins
2018-04-02 12:44:56 -06:00
610bf36947
Merge branch 'master' into restore-links
2018-04-02 14:44:01 -04:00
126d55e6d8
Merge pull request #1494 from coralproject/fix-install
...
Fix install buttons
2018-04-02 14:43:27 -04:00
6f0af18619
Merge branch 'master' into webpack-plugins
2018-04-02 12:27:41 -06:00
3da201c22d
allow plugin code from clients to be parsed by webpack
2018-04-02 12:25:18 -06:00
5ae9d719f3
Merge branch 'master' into fix-install
2018-04-02 13:43:42 -04:00
91bce6c74a
Merge pull request #1481 from coralproject/scraper
...
Scraper improvements
2018-04-02 13:43:33 -04:00
232ed4f4ef
Merge branch 'master' into restore-links
2018-04-02 13:42:32 -04:00
7720f1d178
Merge branch 'master' into #156312019
2018-04-02 14:38:21 -03:00
533cd3217d
Merge branch 'master' into fix-install
2018-04-02 13:37:12 -04:00
d16ce17e36
SaveChangesDialog
2018-04-02 14:35:09 -03:00
e8026afb41
Merge branch 'master' into scraper
2018-04-02 13:34:24 -04:00
81509b660e
Spanish translations
2018-04-02 14:19:25 -03:00
4ed04d1c39
Adding translations
2018-04-02 14:12:02 -03:00
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
Belén Curcio