Commit graph

3027 commits

Author SHA1 Message Date
ansuz
22c5ff757b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 15:05:07 +01:00
ansuz
650d26afea use unified listmap in profile app 2017-11-27 15:04:59 +01:00
yflory
68d602f74a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 14:44:57 +01:00
yflory
644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz
5eacc158d9 make tests pass again 2017-11-27 13:45:40 +01:00
ansuz
812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
ansuz
be5c5831dd lint compliance 2017-11-27 12:18:04 +01:00
yflory
444ba91287 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 12:17:46 +01:00
yflory
b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz
77c81f2426 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging 2017-11-27 12:16:47 +01:00
ansuz
4ff4ccd1d3 use faster and more correct 'find' implementation 2017-11-27 11:30:50 +01:00
ansuz
e3f04ef076 Merge branch 'soon' into staging 2017-11-27 11:11:49 +01:00
ansuz
71cf3a4ddf fix creation of personal todo list 2017-11-27 11:09:28 +01:00
ansuz
701af29192 fix broken register/login process 2017-11-24 15:12:00 +01:00
ansuz
a3c093838c merge latest staging and resolve conflicts 2017-11-24 13:46:59 +01:00
ansuz
56102d3689 use unified listmap 2017-11-24 13:40:21 +01:00
ansuz
661db129b2 lint compliance 2017-11-24 10:32:58 +01:00
ansuz
80978377f2 return transformed cursor value 2017-11-24 10:03:45 +01:00
ansuz
2e00214783 drop unreachable code 2017-11-23 16:57:01 +01:00
ansuz
ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory
9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory
4b5abdecbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-23 12:29:32 +01:00
yflory
280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
ansuz
98c2b0c802 Merge branch 'soon' into staging 2017-11-22 17:38:49 +01:00
ansuz
3ff0eb116b don't let search interfere with renaming 2017-11-22 17:23:14 +01:00
yflory
eba1c9dfac Add chainpad log to the debug app 2017-11-21 18:50:33 +01:00
yflory
a660c03f97 Fix scrollbar in the debug app 2017-11-21 17:42:50 +01:00
yflory
30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-21 17:37:53 +01:00
yflory
06011065d2 Add a debug app 2017-11-21 17:37:38 +01:00
ansuz
60c4973d62 resolve merge conflicts 2017-11-21 17:22:06 +01:00
ansuz
585f9d2e4e repair broken 'clear channel' button 2017-11-21 17:19:35 +01:00
yflory
000f3edd1d Constants file 2017-11-21 16:47:19 +01:00
yflory
477f14bb8b Put constants in a separate file 2017-11-21 16:46:19 +01:00
ansuz
9d662bd337 fix right-click pad creation in drive 2017-11-21 15:21:37 +01:00
ansuz
d726c95f0b fix namespace collision 2017-11-21 15:10:28 +01:00
ansuz
c8a9afb6c8 remove duplicate loading screen 2017-11-21 15:09:53 +01:00
yflory
7f88d1d43a Improve drive loading speed 2017-11-21 11:09:59 +01:00
yflory
06ede6b294 Fix export in apps using framework 2017-11-21 10:26:33 +01:00
yflory
c35e3d644e Make sure dates are stored as numbers in the drive 2017-11-20 15:37:23 +01:00
yflory
655dfe971d Add translation for the edit username button in the userlist 2017-11-20 14:28:35 +01:00
yflory
eb88efd83f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-20 14:17:37 +01:00
yflory
80803ad076 Fix empty codemirror after thumbnail creation 2017-11-20 14:17:29 +01:00
ansuz
a8d5a68eb5 open links correctly in contacts app 2017-11-20 14:06:19 +01:00
ansuz
7441a68fb9 update test after merging api changes 2017-11-20 12:22:26 +01:00
ansuz
d1beb6493b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-20 12:20:13 +01:00
ansuz
b96ea47f1f strip tracking parameters when parsing urls 2017-11-20 12:09:17 +01:00
yflory
e2cf46d725 Add new keyboard shortcuts for the drive search 2017-11-20 11:50:52 +01:00
yflory
cf26c4c286 Improve the toolbar UI for smaller screens 2017-11-17 18:21:45 +01:00
yflory
fc02f97d78 Use less2 classes in the user menu 2017-11-17 18:20:45 +01:00
yflory
41a082c46d Fix video thumbnails 2017-11-17 18:20:02 +01:00