Commit Graph

4224 Commits (1dabea84d9029c013c3d7d7e80ece92a8d1ab834)

Author SHA1 Message Date
yflory b28c1537e8 Fix history in readonly mode 2017-10-12 10:59:23 +02:00
yflory 620ba4ed5d Fix fouc in drive 2017-10-11 17:15:56 +02:00
yflory b31bbebf7b Buttons are missing in whiteboard when zoomed in 2017-10-11 17:11:38 +02:00
yflory a5a08176fb Merge branch 'master' into staging 2017-10-11 16:58:45 +02:00
yflory 00d88dd421 Merge branch 'soon' 2017-10-11 16:38:13 +02:00
yflory 54b5a2d654 Fix style issues in poll (Chrome) 2017-10-11 16:01:26 +02:00
yflory 86767184da Fix style issues in poll for Edge 2017-10-11 15:38:23 +02:00
yflory 00e8d32d60 Fix column position in poll for Chrome 2017-10-11 15:37:47 +02:00
yflory b110e1b8da Fix style issues in poll for Edge 2017-10-11 15:37:11 +02:00
ansuz 253e92fe33 Merge pull request #184 from sssemil/patch-1
Add dots
2017-10-11 11:01:18 +02:00
Emil Suleymanov fe3bea877d Add dots
Yep, just dots.
2017-10-11 00:47:03 +02:00
yflory ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +02:00
ansuz d4cd67f7a7 update current version of readme 2017-10-10 13:26:31 +02:00
ansuz 4242f35b51 Merge pull request #181 from genma/master
Cryptad version in Readme.md added
2017-10-10 13:27:38 +02:00
yflory 75b3ff9c60 CSS issue in polls 2017-10-10 11:35:24 +02:00
yflory c46280d032 Fix style issues for Edge 2017-10-10 11:32:52 +02:00
yflory c985aa60aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 17:30:14 +02:00
yflory f4189f883e Add missing french translation keys 2017-10-09 17:28:56 +02:00
ansuz 128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin 2017-10-09 17:20:23 +02:00
ansuz d046b9ce33 add missing French key 2017-10-09 17:16:48 +02:00
ansuz f0bdc3b26f second try 2017-10-09 16:57:30 +02:00
ansuz d50a692986 add note about tags to prompt 2017-10-09 16:51:57 +02:00
CatalinScr 21f1a48380 changed the login in button 2017-10-09 17:17:33 +03:00
Caleb James DeLisle c8928a0811 Switch the transform function and also stop calling textPatcher without the metadata 2017-10-09 17:07:26 +03:00
yflory d3d6940b69 Update french translation for tags 2017-10-09 15:47:28 +02:00
ansuz 3f181fa370 update loading screen tip for tags 2017-10-09 15:38:33 +02:00
ansuz c0bf34fd02 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 15:36:29 +02:00
yflory 035150614d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 15:38:08 +02:00
yflory 484e216054 Fix hashtag button in the toolbar 2017-10-09 15:37:37 +02:00
ansuz f751554f82 update footer and package.json for upcoming version 2017-10-09 15:15:04 +02:00
yflory 4c19375f4d Avoid missing characters in poll's inputs 2017-10-09 15:11:02 +02:00
ansuz a12239405b fix toolbar 'home link' to visit home page from drive 2017-10-09 15:10:38 +02:00
yflory dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +02:00
Caleb James DeLisle 36aee2d174 lets try normalizing the dom before applying a patch 2017-10-09 14:13:11 +03:00
Caleb James DeLisle 828a685ba8 Fix broken browser fight logging 2017-10-09 14:12:55 +03:00
yflory aa744567ed Fix thumbnails in sframe apps 2017-10-09 11:52:34 +02:00
yflory 5e7bf0cfb8 Embed an image in whiteboard 2017-10-09 10:32:24 +02:00
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework 2017-10-06 14:50:35 +03:00
Caleb James DeLisle 9509d538e0 Cursor not being updated at the right times before applying a patch. 2017-10-06 14:49:52 +03:00
yflory 888028c542 Lint 2017-10-05 18:13:28 +02:00
yflory e5a54b5978 Fix folder highlighting with drag&drop in the drive 2017-10-05 18:12:23 +02:00
yflory 1c7c37c121 Add the file class to pads in 'template' and 'recent' categories in the drive 2017-10-05 18:07:05 +02:00
yflory ab3648a30a Merge branch 'newpoll' into staging 2017-10-05 17:56:17 +02:00
yflory 1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
ansuz 7559bc062e lint compliance 2017-10-05 17:06:02 +02:00
ansuz 080511efcd add missing translation for hashtags 2017-10-05 17:01:39 +02:00
ansuz 503111d26a use recompiled media-tag 2017-10-05 17:00:47 +02:00
ansuz 427afc3954 override modified file name in pdfjs 2017-10-05 16:59:55 +02:00
ansuz d85db64939 add tags from drive 2017-10-05 16:58:34 +02:00
Caleb James DeLisle 0aecfad854 Occasionally the language selector only says "Mode" rather than the language 2017-10-05 16:12:49 +03:00