625 Commits (07d9c17ab0f230be21d87a04fb8b859bdb5bbe72)

Author SHA1 Message Date
yflory 6f020b67ca Add thumbnails to framework apps 7 years ago
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework 7 years ago
yflory e553351b79 Put the add friend button in the userlist below the name 7 years ago
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework 7 years ago
ansuz 128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin 7 years ago
CatalinScr 21f1a48380 changed the login in button 7 years ago
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework 7 years ago
yflory ab3648a30a Merge branch 'newpoll' into staging 7 years ago
Caleb James DeLisle d9e97b86e6 Merge branch 'staging' into framework 7 years ago
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. 7 years ago
ansuz 351b95d6a9 resolve merge conflicts 7 years ago
yflory 66da349ee4 Sandboxed Poll app with less2 7 years ago
yflory e02a779c14 Use secure drive as default drive 7 years ago
yflory b4de31c827 Merge branch 'newdrive' into staging 7 years ago
ansuz b3e066eaca show loading screen tips during loading screen 7 years ago
yflory cdeac00633 Merge branch 'staging' into newdrive 7 years ago
yflory 1d7683503f Fix link origin in sframe upload table 7 years ago
yflory 92c808812a Fix missing style in toolbar/less2 7 years ago
yflory c364377d7c Use less2 in sframe drive 7 years ago
yflory dfdeb7b113 Fix style and race condition for history mode 7 years ago
yflory a810d7bd85 Fix style and race condition for history mode 7 years ago
yflory 456370b1aa Base for Drive in sandboxed iframe 7 years ago
ansuz 53b98c12c9 ignore broken stylesheet 7 years ago
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 8a09e39f46 Enable tags in pads 7 years ago
ansuz d2b27f3588 resolve merge conflicts 7 years ago
ansuz f127240a2f add poll to main.less 7 years ago
yflory 6683434c62 Fix wrong relative url 7 years ago
yflory 732585ea7b Sandboxed iframe for the whiteboard app 7 years ago
ansuz f9d27d2783 WIP secure contacts 7 years ago
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 7 years ago
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz f039fc7ff5 develop a system for avoiding z-index problems 7 years ago
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory ab64bf9e59 Use less2 for the loading screen 7 years ago
ansuz 244e3ecba7 support forefront flag in alert config 7 years ago
yflory 437f50fd4a Migrate the file to a sandboxed iframe 7 years ago
yflory 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar 7 years ago
yflory 7582c9cffd Fix register button in the index dropdown menu for mobiles 7 years ago
yflory c3a07e879c Merge branch 'staging' into slide2 7 years ago
yflory f2aaaa9751 Move slide to secure iframe 7 years ago
ansuz 809b56625d refactor ui elements 7 years ago
ansuz ef30b0bc42 contribute to z-index arms race 7 years ago
ansuz 263c2eb2c2 fix overflowing title text 7 years ago
ansuz 15e24ebe4f ui for hashtag picker 7 years ago
yflory 204e45dfae Enable templates in pad 7 years ago
yflory 78b338c379 Merge branch 'code2' into staging 7 years ago
yflory d2787e3eff Make code2 the default code app 7 years ago
yflory 86e23ac19f Use less2 in secure iframes 7 years ago
ansuz 7b27b8635d fix padding on registration button 7 years ago
CatalinScr 0ceb4cbbcb Updated the contact page with the new design 7 years ago
CatalinScr 83be769bb3 Merge branch 'master' into staging
updated with new version
7 years ago
CatalinScr 1bf77cb77e changed the icons 7 years ago
CatalinScr f95f3f4f24 Updated the contact page 7 years ago
yflory 0893bcc0e5 Merge branch 'staging' into code2 7 years ago
yflory 7498057c89 Fix Safari iframe size 7 years ago
yflory a2ed266048 Move the code app in a secure iframe 7 years ago
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 7 years ago
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2 7 years ago
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js 7 years ago
yflory 1752124071 Fix Iframe height in Edge 7 years ago
Caleb James DeLisle b081603455 Update requirejs 7 years ago
yflory 0a813b4fab Fix limit bar overflowing when over the limit 7 years ago
CatalinScr 744fb407ae Updated the what is page 7 years ago
ansuz 8ee5e14a60 merge ui-integration 7 years ago
CatalinScr fd3fd945c8 Updated the Log in Page 7 years ago
CatalinScr 1f4d0a0a56 Repaired a bug 7 years ago
CatalinScr dd48cf7c90 updated the register page 7 years ago
CatalinScr 3196d4558f repaired the responsive error at about page 7 years ago
CatalinScr 3960cd25f8 Updated the about page with the new design 7 years ago
Caleb James DeLisle 196ce3b3f7 Fix alertify style which made the registration popup look bad 7 years ago
Pierre Bondoerffer f580d9a30a
*actually* fix alertify on mobile 7 years ago
Pierre Bondoerffer 144f9f4c83
alertify fix on mobile 7 years ago
Pierre Bondoerffer b00d37d9e7
proper namespace for font 7 years ago
Pierre Bondoerffer 0f74dffc48
fix register button being cut off 7 years ago
Pierre Bondoerffer 92d3b1a9fc
actually pull in open-sans, move fonts to own include 7 years ago
Pierre Bondoerffer 04b84538e1
add Open Sans font (with bower) 7 years ago
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page 7 years ago
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow 7 years ago
Pierre Bondoerffer ec011b15d5
remove duplicate css property 7 years ago
Pierre Bondoerffer 34ba673cd3
improve file upload UI 7 years ago
Pierre Bondoerffer 90075cd48e
media-tag to less file 7 years ago
Pierre Bondoerffer 88be5444f0
change alertify warn color 7 years ago
Pierre Bondoerffer c53e738054
improve file picker ui 7 years ago
Pierre Bondoerffer 008fa12755
alertify: add textarea + checkbox 7 years ago
Pierre Bondoerffer e486e47aa1
alertify: fix input color + better log styles 7 years ago
Pierre Bondoerffer e333e7903d
fix styles overlapping 7 years ago
Pierre Bondoerffer 1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer dac14de18c
unify fonts 7 years ago
CatalinScr 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
CatalinScr 3f6b234e97 Styled the general menu, footer, updated about 7 years ago
Pierre Bondoerffer d3fb6313b6
color logo on topbar 7 years ago
Pierre Bondoerffer 865ba0731c
better colors? not sure yet... 7 years ago
Pierre Bondoerffer 1bd42f0b3e
make alertify darker 7 years ago
Pierre Bondoerffer ecc766eb7b
remove useless margin 7 years ago
Pierre Bondoerffer addd91cc72
fix styles (again) copyright cjd 2017 7 years ago
Pierre Bondoerffer 5c21a9048e
fix styles 7 years ago
Pierre Bondoerffer 10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer 6614f3f0e6
put the page class on html element 7 years ago
CatalinScr 043ae4280b repaired the menu 7 years ago
CatalinScr 250d85bb8a Repaired the menu, clead the code 7 years ago
Pierre Bondoerffer 4018c7e0a6
move alertify stuff 7 years ago
Caleb James DeLisle 0d1f19f5d4 Big manual merge 7 years ago
CatalinScr e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
7 years ago
CatalinScr d4ce7d626c Modified the menu 7 years ago
Pierre Bondoerffer f8c7140eec
make fonts big 7 years ago
Pierre Bondoerffer f6d45d05f6
use logo in toolbar 7 years ago
Caleb James DeLisle 5d70dd93b3 Manual merge 7 years ago
CatalinScr 15fa801bc8 work in progress 7 years ago
CatalinScr 89ab82c0e2 Changed the menu, added the logo on top bar 7 years ago
Pierre Bondoerffer ae176b0465
about page mockup 7 years ago
Pierre Bondoerffer 86bc14e6bb
new loading screen 7 years ago
Pierre Bondoerffer 304a29e210
Improve contact page 7 years ago
Pierre Bondoerffer d6679e8ef3
Add screenshots to What is CryptPad 7 years ago
Pierre Bondoerffer e2f8c9c5da
add logo to topbar 7 years ago
Pierre Bondoerffer cd0c9cc95a
create less templates for info pages 7 years ago
Pierre Bondoerffer f71b082aac
remove min-height globally, style footer 7 years ago
Pierre Bondoerffer 0fe49d6641
oops, sorry, back to 100% height 7 years ago
Pierre Bondoerffer dc0a037894
turn login and register into infopages 7 years ago
Pierre Bondoerffer 549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer 775ea81504
start register page 7 years ago
CatalinScr 69c470330f updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
7 years ago
CatalinScr e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu 7 years ago
Caleb James DeLisle 27aa1886b1 Move footer to pages.js and add it to the contact page 7 years ago
Caleb James DeLisle 490e2b4d0a work in progress on migrating styles back into the infopages.less 7 years ago
Caleb James DeLisle cd2b41f51e Fix up some less for supporting the info-pages 7 years ago
Caleb James DeLisle 896186d059 Fix some wrong less files which were breaking the UI of the apps 7 years ago
ansuz 4614d6ae81 remove legacy max-width from usage bar 7 years ago
CatalinScr 87dec4a091 Changed the font size 7 years ago
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more 7 years ago
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive 7 years ago
Caleb James DeLisle 428bee6306 make links clickable and make more link work 7 years ago
yflory 3da76e3ae8 Update style for the todo app 7 years ago
CatalinScr 5fa20836cf Modified Register and login button 7 years ago
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo 7 years ago
CatalinScr 796bf89491 Update of the front-page 7 years ago
Caleb James DeLisle 49c760131e wip 7 years ago
Nicolas Lemoine 658b00814b TodoApp - Style and translations 7 years ago
Caleb James DeLisle 6a1ec54e2a wip 7 years ago
Pierre Bondoerffer dc9565f22f
make buttons colorful 7 years ago
Caleb James DeLisle 8404017af1 wip 7 years ago
yflory a80b00a765 Move the file picker in common 7 years ago
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page 7 years ago
yflory c33d2a2db0 New tooltips 7 years ago
yflory baf439648e Add the contacts app in the dropdown menu 7 years ago
yflory aa8181ab2b Contacts app translations 7 years ago
ansuz f2320190b8 change friends url to /contacts/ 7 years ago
ansuz 6306de5265 set avatar border-radius to 4px 7 years ago
ansuz 33dcd2ae28 drop black border from avatars in userlist 7 years ago
ansuz e2c17dbeb4 resolve conflicts 7 years ago
yflory 557f13f796 Unfriend and update username - beta 7 years ago
ansuz 96d2ff67e1 user-plus as icon for add-friend 7 years ago
Caleb James DeLisle f6abdc2b86 manual merge of staging 7 years ago
yflory ac684a8dc7 Use the APP toolbar in profile 7 years ago
yflory b3e225cb3b Replace spinner by text and fix mobile UI 7 years ago
yflory 42075e4b5f Make everything 16px and 32px 7 years ago
yflory 16d0527e92 Add a page title in drive, settings and file 7 years ago
yflory 5d5f936682 Hide the upload table in code 7 years ago
yflory a0b14faf89 Fix the font in settings and drive 7 years ago
yflory 112c4c85e5 Left menu in drive 7 years ago
yflory 560671ae7d Make avatars circle 7 years ago
yflory 125018c8c3 New settings page 7 years ago
yflory c02fa39524 Make drive search bar blue 7 years ago
yflory 0157e04b10 Fix overflowing content in the home page 7 years ago
yflory e6188bfb63 Fix useradmin dropdown position 7 years ago
yflory e8f3df5a46 Clean less 7 years ago
yflory 159d72f33b Merge branch 'msg' into staging 7 years ago
yflory ff10c282d4 Avatar in the user admin button 7 years ago
ansuz 6f7c60bf12 Merge pull request #154 from evalica/153
Issue #153: On Register, add spacing between checkboxes and labels
7 years ago
Ecaterina Moraru (Valica) e8e8858e44 Issue #153: On Register, add spacing between checkboxes and labels 7 years ago
Ecaterina Moraru (Valica) fc065a0484 Issue #151: Spacing between "Log-in" and "Register" buttons
- Removed ".first" class from Register button
- Increase spacing between buttons
7 years ago
yflory a5e8f6ae81 Add friend app and fix avatar size 7 years ago
ansuz f02285d103 fix lowercased p 7 years ago
yflory bf17ad3f1e Friend button in the userlist 7 years ago
yflory d7f9ddd8d2 Fix icon colors in the new menu (/pad app) 8 years ago
yflory cc67838786 Fix horizontal scrollbar in /pad anonymous mode 8 years ago
Caleb James DeLisle 25905d13fa wip 8 years ago
yflory 47c6c64b8a Allow emojis in default avatars 8 years ago
yflory ffd184d50e Fix overflowing names in the new userlist 8 years ago
yflory 1a27f11e73 Fix dropdown menus in static pages 8 years ago
yflory fa2d857d70 Fix css issues with Safari 8 years ago
yflory 1df5e6e855 Fix toolbar buttons for Safari 8 years ago
yflory 70c9f3df75 Fix avatar size 8 years ago
yflory 335898a4c7 Hack the drawer to close it when clicking outside 8 years ago
yflory b153dda6ff Add avatars in the user list 8 years ago
yflory b6944e6638 Fix userlist style in apps without iframe 8 years ago
yflory 568ce70afd Add a spinner for the history and update history buttons 8 years ago
yflory b9320e6005 Toolbar improvements 8 years ago
ansuz b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 8 years ago
ansuz 0b9d7d6c0b fix color of links in poll and whiteboard 8 years ago
yflory 56a25e1036 Small fixes for the new toolbar 8 years ago
ansuz c53ebe3598 bring upload status container to the front 8 years ago
ansuz 7de2683169 make all apps use clientside templates 8 years ago
yflory c431041e3f Fix position of the rightside drawer with small screen 8 years ago
yflory 36ef4178dc Remove the editable title from the file app 8 years ago
yflory ce44a8d351 Fix the backup button in anonymous drive 8 years ago
yflory 06a0590f73 New folder icons 8 years ago
yflory 0d4d104e08 Mobile support for the new toolbar 8 years ago
yflory 684269fdda Userlist in polls 8 years ago
yflory a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 13288ee18b Update the userlist in code, slide and pad 8 years ago
yflory 92b6e60573 Small improvements for the new toolbar 8 years ago
ansuz eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 115813c191 Merge branch 'new-templates' into staging 8 years ago
ansuz 3657e978fd give main2.js a more sensible name 8 years ago
yflory 8d956c3de6 New toolbar 8 years ago
ansuz 48f9745619 clientside templating 8 years ago
yflory b7a0547b77 New toolbar colors 8 years ago
yflory 59fb5bd8be One toolbar color per app 8 years ago
yflory 5a248db267 Merge branch 'staging' into newCk 8 years ago
yflory f13d23241c Upgrade CkEditor to version 4.7 8 years ago
ansuz 3f85471ab3 update footer and package.json for upcoming version 8 years ago
yflory f9c26645cf Upload images using the slide app 8 years ago
yflory 376b60c21c New toolbar temp 8 years ago
ansuz f43132a63b bump version in footer and package.json 8 years ago
ansuz 767793b5ca fix stuck loading tip 8 years ago
ansuz ebfa228bc0 add upgrade button to all static pages 8 years ago
ansuz 3915b30055 provide a register button on login
also direct users from file to login
8 years ago
yflory 6ddfe0e901 Fix new lines in /pad userlist 8 years ago
yflory 0c2f84058b Improve css for the file app 8 years ago
yflory 21f9e31e75 Add a placeholder for the user app 8 years ago
ansuz 3ba94a1ba2 correctly set release version number 8 years ago
ansuz 4debec39bb update footer with next release codename and corrected matrix link 8 years ago
yflory dc2cdb7c08 Add the usage bar in the settings page 8 years ago
yflory 716245f864 Make all the buttons look the same 8 years ago
yflory 0f37d9def7 Change the button font size in the toolbar 8 years ago
yflory 48496416e7 Use the same font-size for all the toolbar buttons 8 years ago
yflory 5a21be8112 Improve UI on mobile 8 years ago
yflory bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 6847906ac9 Move the userlist code in a separate file 8 years ago
ansuz c07d3e6162 update version strings for upcoming release 8 years ago
yflory a190c99426 Toolbar refactoring 8 years ago
yflory ef89451a83 Display the storage limit in the drive 8 years ago
yflory f414d480a9 Add the history mode to the CryptDrive 8 years ago
yflory 16f6ab813c Make it clear that the number is the history represents a version 8 years ago
yflory 0ee228666b Replace the IRC link by the Matrix one 8 years ago
yflory ab1dc48b6d Fix the 'limit reached' icon in the pad app 8 years ago
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 8 years ago
ansuz a5ca461a73 update footer for new version 8 years ago
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 8 years ago
yflory 92ea03d7d9 View and restore the history of a pad 8 years ago
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 8 years ago
yflory 43c045721c Get the channel history 8 years ago
Pierre Bondoerffer f11cf8e6ac
move poll styles to separate file 8 years ago
ansuz cde9ea9887 update footer version 8 years ago
ansuz 5a85e4464c fix poor visibility on green pencils 8 years ago
ansuz 7908f3b4f0 make sure green UI elements use the same green 8 years ago
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 8 years ago
ansuz 364dae2882 update templated html 8 years ago