Commit graph

1275 commits

Author SHA1 Message Date
ansuz
087eee55f6 update 404 page 2017-12-04 18:31:07 +01:00
ansuz
f95669a27a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 17:33:13 +01:00
ansuz
fc4fea9c54 update 404 messages and show actual text faster 2017-12-04 17:33:06 +01:00
yflory
f52d987515 Ability to resize avatars before uploading them 2017-12-04 15:03:43 +01:00
yflory
e164edec03 Fix the webworker app 2017-12-01 18:29:59 +01:00
yflory
04e02871bc Merge branch 'refactor2' into staging 2017-12-01 14:50:19 +01:00
yflory
4903bd0757 Enable messenger in async store 2017-12-01 14:49:21 +01:00
ansuz
5acbaef28f tweak animation parameters for faster 'decryption' 2017-12-01 14:03:13 +01:00
ansuz
c80c97d7db lint compliance 2017-12-01 13:23:23 +01:00
ansuz
bcdc0d810a make 404 page translateable, point to home page or drive 2017-12-01 11:51:04 +01:00
ansuz
443eeaa407 fancy 404 page 2017-11-30 19:17:59 +01:00
yflory
acd8ab7446 Add the markdown toolbar in profile 2017-11-27 18:10:37 +01:00
yflory
74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
yflory
b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
yflory
9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory
280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
yflory
cdd8c6e110 Fix history mode not centered 2017-11-21 17:48:43 +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
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
yflory
e8e90905e4 Fix assert translations 2017-11-20 14:23:56 +01:00
ansuz
78e972201a bump CryptPad version 2017-11-20 14:16:55 +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
af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory
25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +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
9184dd0ce6 Merge branch 'refactor2' into staging 2017-11-14 11:53:13 +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
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
101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
yflory
2ff66e1a7c Update french translation 2017-11-06 17:39:41 +01:00
ansuz
2c9df23849 update english text for removing from trash in the drive 2017-11-06 17:37:29 +01:00
ansuz
d10f752457 s/delete/move to trash 2017-11-06 17:07:37 +01:00
ansuz
402fae442d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-06 15:14:21 +01:00
ansuz
c5f6491c37 bump footer and package.json to latest version 2017-11-06 15:14:02 +01:00
yflory
2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
yflory
1871749b6f Fix -1 viewer in the userlist when disconnected 2017-11-03 15:14:23 +01:00
yflory
cf3024ef5b Ability to display an error in the toolbar state 2017-11-03 14:30:59 +01:00
yflory
e0f7df80b3 Fix avatar upload and use less2 everywhere in profile 2017-10-31 11:11:29 +01:00
yflory
7f9b21405b Add missing files for profile 2017-10-31 10:27:41 +01:00
yflory
4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
yflory
abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 15:12:29 +01:00
yflory
68accaf653 Todo in sframe with less2 2017-10-30 15:12:15 +01:00
Evilham
735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham
83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
yflory
6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
ansuz
69f9a7ebf3 make userlist change notifications configurable 2017-10-24 17:29:58 +02:00
yflory
204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 15:17:09 +02:00
yflory
74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz
7d1892546b add missing french translation 2017-10-23 14:59:14 +02:00
ansuz
2e5fdf709a Merge branch 'soon' into staging 2017-10-23 14:29:01 +02:00
ansuz
aaef30f489 bump cryptpad version 2017-10-23 14:05:49 +02:00
yflory
ce5d24a1d3 Remove error message about Tether 2017-10-23 11:57:10 +02:00
ansuz
d571f408d8 Merge pull request #185 from MacLemon/reduce-image-asset-size
Compressed images for faster connections
2017-10-23 11:46:56 +02:00
yflory
3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +02:00
Yannick A
63dcfd6d18 Update French translation 2017-10-19 21:02:03 +02:00
Caleb James DeLisle
a149152f11 Merge branch 'staging' into framework 2017-10-18 11:42:31 +03:00
yflory
e553351b79 Put the add friend button in the userlist below the name 2017-10-17 12:39:25 +02:00
yflory
6920129126 Embed images from the drive in whiteboard 2017-10-17 12:19:57 +02:00
MacLemon
867b971c33 Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections. 2017-10-14 00:31:31 +02:00
yflory
2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
Caleb James DeLisle
15337603bb Merge branch 'staging' into framework 2017-10-13 13:41:24 +03:00
Caleb James DeLisle
753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory
62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +02:00
yflory
50090a3af6 Add placeholders for the comment form in poll 2017-10-12 12:18:32 +02:00
yflory
ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +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
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
f751554f82 update footer and package.json for upcoming version 2017-10-09 15:15:04 +02:00
yflory
dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +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
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
080511efcd add missing translation for hashtags 2017-10-05 17:01:39 +02:00
Caleb James DeLisle
d9e97b86e6 Merge branch 'staging' into framework 2017-10-05 12:14:37 +03:00
Caleb James DeLisle
383c2f54cb 1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation. 2017-10-05 12:14:03 +03:00
yflory
26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory
846b1a9fb3 Improve description UI in poll. Enable tags and mediatag 2017-10-04 15:39:18 +02:00
yflory
68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
ansuz
e2f53eaddb add loading screen tip about hashtags 2017-10-03 18:39:03 +02:00
ansuz
b8ce149db6 add hint about tag usage 2017-10-03 18:36:34 +02:00
yflory
5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
Caleb James DeLisle
94d2f4472b Stop using presentSuccess because it is hidden behind the modal in slide 2017-10-03 12:10:16 +03:00
ansuz
351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00