dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,107 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

1185 Commits

Author SHA1 Message Date
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