Commit graph

4169 commits

Author SHA1 Message Date
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
ansuz
2ff1a17ade Merge branch 'soon' into staging 2017-11-21 17:02:59 +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
8150abddbe remove dead code from pages.js 2017-11-21 15:52:37 +01:00
ansuz
4ffb59dce9 bump to version 1.21.0 2017-11-21 15:47:06 +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
e8e90905e4 Fix assert translations 2017-11-20 14:23:56 +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
78e972201a bump CryptPad version 2017-11-20 14:16:55 +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
ce3600b026 Update translation keys 2017-11-20 10:41:27 +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
yflory
fd258fc277 Fix preview button tooltip in code 2017-11-17 18:19:35 +01:00
yflory
fe9261f6a2 Fix modules order in TODO 2017-11-17 18:19:11 +01:00
yflory
af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory
31b31654ec Lint compliance 2017-11-16 18:57:33 +01:00
yflory
25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +01:00
yflory
2813b7219e Fix the public key using the wrong domain in settings 2017-11-16 13:35:07 +01:00
yflory
a96e49d55a Fix filepicker creating a new netflux network when initialized 2017-11-15 16:56:50 +01:00
yflory
630ac45948 Fix laggy and blinking tooltips 2017-11-15 16:31:26 +01:00
yflory
1f53304ad3 Display a dropdown menu inside another one 2017-11-15 15:35:28 +01:00
yflory
014e12b5b5 Ability to update the username from the userlist 2017-11-15 11:32:54 +01:00
yflory
bdd24ed14f lint 2017-11-14 11:57:13 +01:00
yflory
9184dd0ce6 Merge branch 'refactor2' into staging 2017-11-14 11:53:13 +01:00
yflory
7cfe64fc5b Remove cryptpad-common dependency for some inner apps 2017-11-13 18:09:19 +01:00
yflory
1514ad5df3 Move the 'logged out' screen inside the sframe 2017-11-13 17:29:00 +01:00
yflory
5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory
af1ea4fd96 Fix typo in the French translation 2017-11-13 16:34:37 +01:00
yflory
30c8c253dd Remove util and hash from common 2017-11-13 16:32:40 +01:00
yflory
c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory
dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
yflory
354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
yflory
be848c1bec Fix broken readonly link in drive 2017-11-09 17:27:50 +01:00
yflory
f931574dac lint compliance 2017-11-09 17:23:13 +01:00
yflory
cf5ccf04f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-09 14:23:54 +01:00