Commit graph

5476 commits

Author SHA1 Message Date
yflory
f5965716b6 Minor update because of flow... 2018-11-27 13:58:33 +01:00
yflory
2a46b8f855 Fix an issue with last known hash in the messenger 2018-11-27 13:42:11 +01:00
yflory
dbad925e5e New cursor recovery system (beta) 2018-11-26 16:23:16 +01:00
yflory
518c1e0d3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-11-22 14:55:34 +01:00
yflory
13d6579861 Add typing test in the code app 2018-11-22 14:45:12 +01:00
yflory
015449832c Fix missing characters caused by concurrent editing 2018-11-22 14:44:46 +01:00
ansuz
56feaff72d Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-11-21 12:07:16 +01:00
ansuz
c71b1c013b add changelog 2018-11-21 12:07:01 +01:00
yflory
331197197a Fix new icons cache 2018-11-20 15:11:19 +01:00
yflory
0e6057ee3c Merge branch 'soon' 2018-11-20 15:02:12 +01:00
yflory
3e45cff7c0 Merge branch 'staging' into soon 2018-11-20 15:01:48 +01:00
yflory
56267f4ee1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-11-20 15:01:17 +01:00
yflory
aa3f6cb7d7 Update some icons in the drive 2018-11-20 15:01:12 +01:00
ansuz
1b83431382 Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad 2018-11-20 13:11:49 +01:00
ansuz
d407f9af74 downgrade an XXX to a FIXME 2018-11-20 11:27:59 +01:00
ansuz
04d96d5d0e remove outdated comments 2018-11-20 11:23:31 +01:00
ansuz
8bbd4e2086 bump version and release codename 2018-11-20 11:14:26 +01:00
ansuz
fcce48f2dd Merge branch 'soon' into staging 2018-11-20 11:12:41 +01:00
yflory
8522c3723d Translations for the NGI logo 2018-11-19 17:08:20 +01:00
yflory
8fbd9d3f2a Add link to the NGI award blog post 2018-11-19 15:48:33 +01:00
yflory
3d712d9008 Merge branch 'cursor' into staging 2018-11-19 15:22:35 +01:00
yflory
9d9845434e lint compliance 2018-11-16 11:28:05 +01:00
yflory
3b9e1ee10c Fix scrolling issue in pads when clicking on buttons 2018-11-15 18:24:01 +01:00
yflory
434d557444 NGI award logo 2018-11-14 16:51:50 +01:00
yflory
ab35d6b778 lint compliance 2018-11-13 17:22:34 +01:00
yflory
3a4cfbb7e8 Disable HTML in chat 2018-11-13 17:19:28 +01:00
yflory
22f1ac9e1e Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-11-13 14:21:24 +01:00
yflory
04decacaca Forbid JavaScript in links to the bounce app 2018-11-13 14:18:09 +01:00
yflory
fc915e3337 Use DiffMarked in messenger to avoid duplicate code 2018-11-13 14:14:23 +01:00
yflory
c64feae7bf Merge branch 'staging' into cursor 2018-11-12 11:51:17 +01:00
yflory
67f3eb40a9 Fix magic line creating an empty space at the top of the pad 2018-11-12 11:50:05 +01:00
yflory
2a6945cbe5 Fix export in the pad app with Chrome 2018-11-12 10:54:21 +01:00
yflory
b166c70a5f Fix conflict when a user was reverting the latest patch from someone else 2018-11-09 16:38:16 +01:00
yflory
8f849d8d4a Merge branch 'staging' into cursor 2018-11-08 18:24:33 +01:00
yflory
4daa2266c0 Fix new network open for each shared folder 2018-11-08 18:24:06 +01:00
yflory
fe0d579d56 Cursor improvements in pad (Beta) 2018-11-08 12:06:46 +01:00
yflory
82c3c7f50b Improve the Typing Test in pad 2018-11-08 10:46:07 +01:00
yflory
a5b04bd62a Download a file from the drive using the context menu 2018-11-06 18:35:04 +01:00
Paul Libbrecht
3f2e6b0611 completion 2018-11-06 13:01:17 +01:00
yflory
dcdc0972dd Update template icon in the drive tree 2018-11-06 11:40:18 +01:00
yflory
335aa19e06 Update changelog 2018-11-06 11:32:49 +01:00
yflory
4e26a8fbc5 Merge branch 'soon' into staging 2018-11-06 10:47:03 +01:00
Paul Libbrecht
12b2224dad Bad syntax error left. Sorry. Now fixed.
paul
2018-11-05 19:10:56 +01:00
yflory
b74e086602 Shortcuts are now added from sframe-common 2018-11-05 17:46:51 +01:00
yflory
d8715754a3 Bump version 2018-11-05 17:34:29 +01:00
yflory
ad156140b7 Update footer 2018-11-05 17:34:10 +01:00
yflory
3314778c54 lint compliance 2018-11-05 17:33:04 +01:00
yflory
05e7d5eb9b Add missing translation 2018-11-05 17:32:25 +01:00
yflory
997692efb4 Use the font-size codemirror setting in the slide app too 2018-11-05 17:30:07 +01:00
yflory
c4c1fcb080 Fix table rendering in polls description 2018-11-05 17:23:01 +01:00