Commit Graph

432 Commits (d10f75245736cf90c71073f991925e017ab07820)

Author SHA1 Message Date
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
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
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
ansuz 128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin 2017-10-09 17:20:23 +02:00
CatalinScr 21f1a48380 changed the login in button 2017-10-09 17:17:33 +03: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
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
ansuz 351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00
yflory 66da349ee4 Sandboxed Poll app with less2 2017-09-27 18:52:04 +02:00
yflory e02a779c14 Use secure drive as default drive 2017-09-27 10:31:35 +02:00
yflory b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +02:00
ansuz b3e066eaca show loading screen tips during loading screen 2017-09-26 10:59:25 +02:00
yflory cdeac00633 Merge branch 'staging' into newdrive 2017-09-25 17:35:06 +02:00
yflory 1d7683503f Fix link origin in sframe upload table 2017-09-25 12:44:05 +02:00
yflory 92c808812a Fix missing style in toolbar/less2 2017-09-25 11:59:05 +02:00
yflory c364377d7c Use less2 in sframe drive 2017-09-25 11:48:42 +02:00
yflory dfdeb7b113 Fix style and race condition for history mode 2017-09-21 18:00:33 +02:00
yflory a810d7bd85 Fix style and race condition for history mode 2017-09-21 18:00:11 +02:00
yflory 456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
ansuz 53b98c12c9 ignore broken stylesheet 2017-09-20 11:33:30 +02:00
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:36:38 +02:00
yflory 8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
ansuz d2b27f3588 resolve merge conflicts 2017-09-19 14:24:26 +02:00
ansuz f127240a2f add poll to main.less 2017-09-19 14:23:54 +02:00
yflory 6683434c62 Fix wrong relative url 2017-09-19 12:03:45 +02:00
yflory 732585ea7b Sandboxed iframe for the whiteboard app 2017-09-19 10:27:31 +02:00
ansuz f9d27d2783 WIP secure contacts 2017-09-18 15:09:01 +02:00
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 2017-09-14 10:48:35 +02:00
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 18:18:45 +02:00
ansuz f039fc7ff5 develop a system for avoiding z-index problems 2017-09-13 17:43:17 +02:00
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:20:26 +02:00
yflory ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
ansuz 244e3ecba7 support forefront flag in alert config 2017-09-13 12:32:30 +02:00
yflory 437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
yflory 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar 2017-09-11 12:04:22 +02:00
yflory 7582c9cffd Fix register button in the index dropdown menu for mobiles 2017-09-11 11:22:41 +02:00
yflory c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
ansuz 809b56625d refactor ui elements 2017-09-07 18:54:58 +02:00
ansuz ef30b0bc42 contribute to z-index arms race 2017-09-07 16:50:06 +02:00