1152 Commits (e553351b79c09b42253ba055ce778d5e8ad14a2d)

Author SHA1 Message Date
Pierre Bondoerffer de23195bd8
fix wrong css class 8 years ago
Pierre Bondoerffer ad4aca4e5f
actually do the changes intended in previous commit 8 years ago
Pierre Bondoerffer 01b2883771
Add headers and footers, generate what-is-cryptpad 8 years ago
Pierre Bondoerffer cd0c9cc95a
create less templates for info pages 8 years ago
Pierre Bondoerffer f71b082aac
remove min-height globally, style footer 8 years ago
Pierre Bondoerffer 0fe49d6641
oops, sorry, back to 100% height 8 years ago
Pierre Bondoerffer dc0a037894
turn login and register into infopages 8 years ago
Pierre Bondoerffer 549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 8 years ago
Pierre Bondoerffer 775ea81504
start register page 8 years ago
CatalinScr 69c470330f updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
8 years ago
CatalinScr e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu 8 years ago
Caleb James DeLisle 27aa1886b1 Move footer to pages.js and add it to the contact page 8 years ago
Caleb James DeLisle 490e2b4d0a work in progress on migrating styles back into the infopages.less 8 years ago
Caleb James DeLisle cd2b41f51e Fix up some less for supporting the info-pages 8 years ago
Caleb James DeLisle 896186d059 Fix some wrong less files which were breaking the UI of the apps 8 years ago
ansuz 4614d6ae81 remove legacy max-width from usage bar 8 years ago
CatalinScr 87dec4a091 Changed the font size 8 years ago
CatalinScr 5ef0325d90 this are css rules modified -- INSERT -- 8 years ago
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more 8 years ago
Pierre Bondoerffer ba95931802
Use translation keys 8 years ago
ansuz 9a733cca0e drop support for legacy iframe 8 years ago
Pierre Bondoerffer f2a78ddfd9
New FR/ES keys 8 years ago
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive 8 years ago
ansuz 1ca00e7e01 resolve merge conflicts 8 years ago
ansuz 411c64df85 Merge branch 'master' into master 8 years ago
Pierre Bondoerffer 93e007b52a
reduce png sizes 8 years ago
ansuz 777dea2014 Merge branch 'staging' into todo 8 years ago
ansuz a458d7fa46 bump to latest version 8 years ago
Caleb James DeLisle 428bee6306 make links clickable and make more link work 8 years ago
ansuz ba9cab762c Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 8 years ago
yflory 459e0b3b16 CSS and bug fixes for todo 8 years ago
ansuz a5b19b1cdd add missing translations 8 years ago
yflory 77d6da841f Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 8 years ago
yflory 3da76e3ae8 Update style for the todo app 8 years ago
ansuz 8cfd8d3270 add translations for todo 8 years ago
CatalinScr 5fa20836cf Modified Register and login button 8 years ago
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo 8 years ago
CatalinScr 796bf89491 Update of the front-page 8 years ago
Caleb James DeLisle 49c760131e wip 8 years ago
Nicolas Lemoine 658b00814b TodoApp - Style and translations 8 years ago
c4rl0sc 2e8e44933a Fixed spelling error in Spanish translation 8 years ago
ansuz dcf5719eaf handle most of the boilerplate stuff 8 years ago
c4rl0sc 064e189495 Fixed spelling issues and improved translation quality. 8 years ago
Caleb James DeLisle 6a1ec54e2a wip 8 years ago
Pierre Bondoerffer dc9565f22f
make buttons colorful 8 years ago
Caleb James DeLisle 8404017af1 wip 8 years ago
ansuz 76e69f0ba8 Merge pull request #127 from gustavohmsilva/master
Merged translated and non-translated in pt-BR
8 years ago
ansuz 52fa77e961 Merge pull request #157 from MacLemon/reduce-image-asset-size
File size reduction and optimization of new image assets
8 years ago
Gustavo H M Silva 6785f166fd Merge branch 'master' into master 8 years ago
ansuz 6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 55cb0734e2 make bad state timeout configurable 8 years ago
MacLemon 25cba8bba3 Translated missing out.presentSuccess to german 8 years ago
MacLemon 29bfcfa719 File size reduction and optimization of new image assets 8 years ago
yflory a80b00a765 Move the file picker in common 8 years ago
yflory 9633025afe CSS for the removeHistory button in contacts 8 years ago
ansuz b22127f10c add history removal 8 years ago
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page 8 years ago
yflory c33d2a2db0 New tooltips 8 years ago
yflory 82c87144cb Remove the friend request button when the request is sent 8 years ago
yflory 1dc98dcff1 CSS for the contacts input field 8 years ago
yflory 26fa914982 Missing translation keys 8 years ago
Pierre Bondoerffer a2c2e98060
Spanish update 8 years ago
yflory 6aab1c94b2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory baf439648e Add the contacts app in the dropdown menu 8 years ago
ansuz 5716f76c91 fix typo in translations 8 years ago
yflory 743b87b70f Add initial text in /contacts 8 years ago
yflory aa8181ab2b Contacts app translations 8 years ago
ansuz 0cd94e2ba8 add title to contacts app 8 years ago
ansuz f2320190b8 change friends url to /contacts/ 8 years ago
ansuz 06c971ec47 s/friend/contact/g 8 years ago
ansuz 2e0aa185cd uppercase first letter of new translation keys 8 years ago
ansuz 6306de5265 set avatar border-radius to 4px 8 years ago
ansuz 33dcd2ae28 drop black border from avatars in userlist 8 years ago
ansuz e2c17dbeb4 resolve conflicts 8 years ago
yflory 557f13f796 Unfriend and update username - beta 8 years ago
ansuz 7be1e249e1 add fa-share-alt to pad initialText 8 years ago
ansuz 96d2ff67e1 user-plus as icon for add-friend 8 years ago
ansuz bf9c2b0b84 new messages 8 years ago
Caleb James DeLisle f6abdc2b86 manual merge of staging 8 years ago
yflory ac684a8dc7 Use the APP toolbar in profile 8 years ago
yflory 2d509e3e25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b3e225cb3b Replace spinner by text and fix mobile UI 8 years ago
ansuz 3453e54357 bump footer and package.json for upcoming version 8 years ago
yflory 42075e4b5f Make everything 16px and 32px 8 years ago
yflory 16d0527e92 Add a page title in drive, settings and file 8 years ago
yflory 5d5f936682 Hide the upload table in code 8 years ago
yflory a0b14faf89 Fix the font in settings and drive 8 years ago
yflory 112c4c85e5 Left menu in drive 8 years ago
yflory 59213a9c4e Typo 8 years ago
yflory 560671ae7d Make avatars circle 8 years ago
yflory 125018c8c3 New settings page 8 years ago
yflory c02fa39524 Make drive search bar blue 8 years ago
yflory 0157e04b10 Fix overflowing content in the home page 8 years ago
yflory e6188bfb63 Fix useradmin dropdown position 8 years ago
yflory e8f3df5a46 Clean less 8 years ago
yflory 159d72f33b Merge branch 'msg' into staging 8 years ago
yflory 8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory ff10c282d4 Avatar in the user admin button 8 years ago
ansuz 52eb8e307c feedback for language used 8 years ago
ansuz 086e5909dd Merge branch 'soon' into staging 8 years ago
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 8 years ago
ansuz c60a71e210 add connect button and view profile button 8 years ago
ansuz 6f7c60bf12 Merge pull request #154 from evalica/153
Issue #153: On Register, add spacing between checkboxes and labels
8 years ago
Ecaterina Moraru (Valica) e8e8858e44 Issue #153: On Register, add spacing between checkboxes and labels 8 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
8 years ago
yflory a5e8f6ae81 Add friend app and fix avatar size 8 years ago
ansuz f02285d103 fix lowercased p 8 years ago
Pierre Bondoerffer 56ed1dd457
spanish update 8 years ago
ansuz 4016a95540 prototype invite app 8 years ago
yflory bf17ad3f1e Friend button in the userlist 8 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
ansuz fa06f9d413 fix minor bugs in poll 8 years ago
ansuz 43d4597f38 merge to master 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 81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1df5e6e855 Fix toolbar buttons for Safari 8 years ago
ansuz bf414c15ee fix logout button on home page 8 years ago
yflory 70c9f3df75 Fix avatar size 8 years ago
Caleb James DeLisle fcff5fa009 wip 8 years ago
yflory 335898a4c7 Hack the drawer to close it when clicking outside 8 years ago
yflory 472a62730b Fix profile creation and add a link to the profile app 8 years ago
yflory f357ec32c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b153dda6ff Add avatars in the user list 8 years ago
ansuz c2e153e8ed more fouc fixes 8 years ago
ansuz 8ffad5ece6 FOUC fixes 8 years ago
yflory b6944e6638 Fix userlist style in apps without iframe 8 years ago
yflory 555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 568ce70afd Add a spinner for the history and update history buttons 8 years ago
Caleb James DeLisle 2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
Caleb James DeLisle c25f2df721 Added caching versions to some of the images which are loaded by js 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 5e56ad912e remove the last bit of compiled css 8 years ago
ansuz 7de2683169 make all apps use clientside templates 8 years ago
ansuz bdca6b10c2 use templates in poll.js 8 years ago
ansuz 3a9b480e4e resolve merge conflicts in template.js 8 years ago
yflory 40f4fc2682 Add the profile app in template.js 8 years ago
ansuz 9b6790534f remove grey text from ckeditor initialState 8 years ago
ansuz e9bfaa9a60 compile less clientside. remove compiled css 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 c364803406 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 805e604e53 Add missing icons 8 years ago
ansuz f181e8db60 correct parentheses 8 years ago
MacLemon f4fdb7040c Optimize image assets to speedup page loading 8 years ago
Gustavo H M Silva 6af4335ead Translated up to page 317
Translated up to page 317
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 5a48cba999 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 684269fdda Userlist in polls 8 years ago
ansuz bd1db735dd jshint compliance 8 years ago
ansuz 35bfa1dce4 test client-side templates in whiteboard app 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 dcfc59c2e2 Translation key updated 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
ansuz e86ef209a8 define loading screen markup in js 8 years ago
ansuz 118b83c420 make register and login user clientside templates 8 years ago
Gogs 6dacbf2bd9 add translations and some improvements 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 9be23be5eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz b80d7513aa skip over the terms of service link 8 years ago
yflory 1275f3f3a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f5da7ae42e Add a new loading tip in french 8 years ago
ansuz e2ff88e4c4 tooltips for file upload 8 years ago
Pierre Bondoerffer 726302a9ee
Spanish update 8 years ago
ansuz 3f85471ab3 update footer and package.json for upcoming version 8 years ago
yflory 66b076111e Add an upload button to the slide's file picker 8 years ago
yflory a237eec41e Add a file picker in the slide app 8 years ago
yflory 1077b3b267 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a98353af6c Add a button to upload a file in the drive 8 years ago
ansuz 9870169e03 remove a few elements from CKEditor config 8 years ago
yflory 2032c08066 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f9c26645cf Upload images using the slide app 8 years ago
ansuz ea79294494 Merge pull request #134 from pbondoer/newpoll
More poll improvements
8 years ago
ansuz 88c2c0afde Merge pull request #135 from blumeva/staging
Staging
8 years ago
XWiki SAS 0004be521c change translation 8 years ago
XWiki SAS 49370764c1 change whiteboard translation 8 years ago
yflory 376b60c21c New toolbar temp 8 years ago
Pierre Bondoerffer 685b352db8
poll: Add show help button 8 years ago
yflory 8471dab6b1 Provide hints in theme and language dropdowns 8 years ago
Pierre Bondoerffer 621376b0fa
small fixes 8 years ago
Pierre Bondoerffer cce665a18b
spanish updates 8 years ago
yflory df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 8 years ago
yflory 6a96aa6819 Disconnect the network when migrating the drive in another tab 8 years ago
ansuz 2f851ab97e fix lint errors 8 years ago
yflory f1271bfd03 Missing file 8 years ago
yflory 5641a4a839 Add the file app in the 'new' dropdown menus 8 years ago
yflory ac91d2f413 Fix the upgrade and donate buttons in the home page 8 years ago
yflory ee57458158 Remove the pin limit alert 8 years ago
yflory 85f1fb86d0 Add missing french translation keys 8 years ago
ansuz f43132a63b bump version in footer and package.json 8 years ago
ansuz ec9a4dec5e Merge branch 'soon' into staging 8 years ago
ansuz 8d4017b79e fix parse error 8 years ago
jxtsai b9b8352633 Traditional Chinese 8 years ago
ansuz 767793b5ca fix stuck loading tip 8 years ago
ansuz d774f8771b remove more unused files 8 years ago
ansuz 540304807c remove unused files 8 years ago
ansuz daf112a5b5 take api settings into account for upgrade button 8 years ago
ansuz ebfa228bc0 add upgrade button to all static pages 8 years ago
ansuz 909bc2ebf3 add new translation key 8 years ago
Gustavo H M Silva 81b931e56f Update messages.pt-br.js 8 years ago
ansuz a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 75874424cf add 'support cryptpad' translation key 8 years ago
Gustavo H M Silva 08619e733a Partial translation + duplicated token fix
Partial translation + duplicated token fix
8 years ago
Gustavo H M Silva 2d2e00b569 Merged translated and non-translated in pt-BR
I've merged the new tokens on the old translation in order to get a better understanding when updating the Brazilian Portuguese translation. It ran fine locally.
8 years ago
ansuz 92a7970eb8 fix merge conflicts 8 years ago
Pierre Bondoerffer 0a92719763
spanish! new keys ahoy 8 years ago
Pierre Bondoerffer 6518b56945
poll: french messages 8 years ago
ansuz 3915b30055 provide a register button on login
also direct users from file to login
8 years ago
Pierre Bondoerffer b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll 8 years ago
ansuz b910915d47 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 6573813523 Merge branch 'soon' into staging 8 years ago
Caleb James DeLisle 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 8 years ago
Pierre Bondoerffer 1092285a68
merge master 8 years ago
Caleb James DeLisle 6c1861dbc6 Merge branch 'soon' into staging 8 years ago
superniko 0559b8cb77 Update messages.ro.js 8 years ago
superniko 70fbbe0078 Update messages.ro.js 8 years ago
ansuz bc26f7fc4e Merge branch 'soon' into staging 8 years ago
Caleb James DeLisle 70c1061f47 Fix romanian translation 8 years ago
Caleb James DeLisle 83c0a6d37d Romanian translation 8 years ago
yflory b281d51d90 Fix typos in the french translation 8 years ago
yflory 38bd6b3808 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 964d046154 Update a french translation key 8 years ago
ansuz cf83cab596 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 0a646a9534 remove unnecessary space 8 years ago
yflory 6ddfe0e901 Fix new lines in /pad userlist 8 years ago
ansuz 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d55b7e411c Display an alert in the drive when the limit is reached 8 years ago
ansuz 2ca6277660 enable pin limits by default 8 years ago
yflory c45f08f147 Use a download button instead of downloading a file automatically 8 years ago
yflory 0c2f84058b Improve css for the file app 8 years ago
yflory 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 538aec6ef5 Display a message when pinPads returns an error 8 years ago
ansuz af4fd3c6d3 resolve merge conflicts 8 years ago
yflory 1ab6eb3c5d Add a queue for multiple uploads in the file app 8 years ago
ansuz ba5ef5157e show pretty representations of storage usage 8 years ago
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz e7a458295b new translation keys for file upload 8 years ago
yflory 814c81fb13 Display an alert when CryptPad has a new version 8 years ago
yflory 21f9e31e75 Add a placeholder for the user app 8 years ago
yflory 620f4dc512 Add translations for the markdown preview button title 8 years ago
ansuz 3ba94a1ba2 correctly set release version number 8 years ago
yflory 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d13dde856a Add the markdown renderer file and change code's default content 8 years ago
ansuz 4debec39bb update footer with next release codename and corrected matrix link 8 years ago
ansuz 517438d7c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 81af9225fc template a Romanian translation 8 years ago
ansuz e8275c02c6 Merge pull request #115 from pbondoer/spanish
Spanish update
8 years ago
Pierre Bondoerffer ad6217f064
file upload spanish keys 8 years ago
ansuz 827233dcba new translation keys for file upload 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 03274c3776 Display an info message in the anonymous drive 8 years ago
Pierre Bondoerffer ad5e18f558
Spanish update 8 years ago
yflory 601226115b New anonymous drive 8 years ago
yflory 5d0535966c Center vertically slides in present mode and checkbox to disable transitions 8 years ago
yflory 5a21be8112 Improve UI on mobile 8 years ago
yflory ca6f910f0b Add french translations for 'log out everywhere' 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 6909f663b6 modify 'log out everywhere' text 8 years ago
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 8 years ago
ansuz c07d3e6162 update version strings for upcoming release 8 years ago
ansuz 3e118c6a38 allow instance-wide custom salt for login 8 years ago
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 78b11584f8 remove unused variables 8 years ago
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a190c99426 Toolbar refactoring 8 years ago
ansuz 410a9dfb17 temporary solution for testing pin limits 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 a165332c15 Don't store a pad in the drive if the limit has been reached 8 years ago
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 8 years ago
yflory f50aa5c29b Move the mediatag viewer into a media app 8 years ago
yflory 9882a3a923 Add support for the file applicaiton in the drive 8 years ago
ansuz e40203480f Merge pull request #113 from pbondoer/staging
Update spanish
8 years ago