1306 Commits (d2b3e078d53f7e357aeaf41bd4bb8e894b416b14)

Author SHA1 Message Date
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 35a313d6ee Make palette realtime 7 years ago
yflory 3023e8c855 Fix templates in whiteboard 7 years ago
yflory 732585ea7b Sandboxed iframe for the whiteboard app 7 years ago
ansuz f9d27d2783 WIP secure contacts 7 years ago
yflory 1131ef0172 Fix language selection in sandboxed iframes 7 years ago
yflory c00d295466 Add missing translations 7 years ago
yflory 974658453c Mediatag integration in pads 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 e0ae0fcd91 thanks Dima! 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
Caleb James DeLisle 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 7 years ago
ansuz 244e3ecba7 support forefront flag in alert config 7 years ago
yflory 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 437f50fd4a Migrate the file to a sandboxed iframe 7 years ago
ansuz ad591fba50 bump version 7 years ago
yflory 8c3e2dbe61 Missing french translation keys 7 years ago
ansuz 306fec2d0e improve messages for template picker confirm 7 years ago
yflory 37dca9c155 Add missing translation keys in french 7 years ago
ansuz 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 7 years ago
ansuz 59d25b4c1a use camel case, not snek case 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 fc069dac48 Ask the user before loading the template picker 7 years ago
yflory f2aaaa9751 Move slide to secure iframe 7 years ago
ansuz 809b56625d refactor ui elements 7 years ago
ansuz bca9ba66cb enforce a configurable minimum password length when registering 7 years ago
ansuz ef30b0bc42 contribute to z-index arms race 7 years ago
ansuz a6eb1444df add loading screen markup to register and login 7 years ago
ansuz 352d504944 avoid loading unnecessary files 7 years ago
ansuz 263c2eb2c2 fix overflowing title text 7 years ago
ansuz cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 15e24ebe4f ui for hashtag picker 7 years ago
yflory fe8b2c2556 Fix french translation 7 years ago
yflory 8f2776657b Add translations for pad embed 7 years ago
yflory 3ca9f41290 Get embed code for pad and code 7 years ago
yflory d22edc03b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 53eb9bb541 Remove the logo from the filepicker loading screen 7 years ago
ansuz 5c9ce0caa5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 77bbb3add4 bump footer and package.json version string 7 years ago
yflory 01881ac469 Update loading tips in the french translation 7 years ago
yflory 729c013af7 Get mediatag embed code from the file app 7 years ago
ansuz 5eb13461c0 remove anchor button 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
ansuz 6bb29e52e2 lint compliance 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 ee325c1813 Repaired the errors from lint 7 years ago
CatalinScr f95f3f4f24 Updated the contact page 7 years ago
yflory 0893bcc0e5 Merge branch 'staging' into code2 7 years ago
yflory d3e947f17e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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
ansuz a34d1793e0 drop 'loading' text from loading screen 7 years ago
ansuz 2ef4ebc6ef two new tips for the loading screen 7 years ago
ansuz 570ff75a6c update footer for latest version 7 years ago
yflory d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 7 years ago
ansuz 54eefd3d94 replace contacts with contacts2 7 years ago
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging 7 years ago
ansuz f9cdbe66a0 add forgotten translation string 7 years ago
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2 7 years ago
Caleb James DeLisle 7bbea28831 minor anti-xss changes... 7 years ago
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js 7 years ago
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 7 years ago
ansuz 89a13d4b21 work on contacts2 until feature parity is reached 7 years ago
Caleb James DeLisle d9f5e3638e Big caching improvements :D 7 years ago
yflory 1752124071 Fix Iframe height in Edge 7 years ago
Caleb James DeLisle b081603455 Update requirejs 7 years ago
CatalinScr 49f7e0d63b Changed the Social Media links to Pierre 7 years ago
ansuz 48fe3ef841 add a tip about cryptdrive 7 years ago
ansuz 839c6df3bb remove invalid loading screen tips. create a new one 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 46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle f7b2aa85b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 3df20760c4 Yann does not have a twitter account. 7 years ago
yflory df8851a53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory df0b7155f6 Add missing french translation 7 years ago
ansuz 127b6dbc6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 2b7dcbe77c remove bs class that caused poor alignment sometimes 7 years ago
Caleb James DeLisle 4213d6de70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle d6125d864c Added Yann's bio 7 years ago
yflory a39f802b4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
yflory e4d842ed08 Fix typos in the french translation 7 years ago
ansuz 7537caf8fe make footer translateable 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 7c8df61f91 sed majik to switch 'What is CryptDrive' to 'What is CryptPad' 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 8c0fe7d277
Add missing UI element translations 7 years ago
Pierre Bondoerffer 144f9f4c83
alertify fix on mobile 7 years ago
Caleb James DeLisle 9833bd7e59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
Caleb James DeLisle 89a8e8050c Fix typo and also change message to explain itself better 7 years ago
ansuz 64849507b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz 328107be4d translation key for using tabs 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
ansuz 958294f109 put code settings in their own tab 7 years ago
ansuz ae0b2ca1a8 add label for code indentation 7 years ago
ansuz 7f2b7fc287 show Your CryptDrive, if logged in. fix typos 7 years ago
Pierre Bondoerffer ef256e3849
go to homepage when on infopages 7 years ago
Pierre Bondoerffer 04b84538e1
add Open Sans font (with bower) 7 years ago
Caleb James DeLisle 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 7 years ago
Pierre Bondoerffer baf64114a6
point to homepage in drive 7 years ago
Caleb James DeLisle 1043e076a4 Merge branch 'ui-integration' into staging 7 years ago
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page 7 years ago
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome 7 years ago
Pierre Bondoerffer c036bb26be
use proper bootstrap class 7 years ago
Pierre Bondoerffer b34e252eda
improve whiteboard styles 7 years ago
Pierre Bondoerffer 8b2cb37c2f
improve poll looks 7 years ago
Pierre Bondoerffer 280c10c57d
alertify: use the right box-shadow 7 years ago
Pierre Bondoerffer 82352b422f
unhide show help button 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 ca686f9c92
(hopefully) fix newline in lists when pasting links 7 years ago
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 7 years ago
Pierre Bondoerffer 2cc6c636db
Add some missing titles 7 years ago
Pierre Bondoerffer 355b7f1839
change recent to local pads 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 996c56c242
fix label in register 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 a16d4be3c4
show logged in user 7 years ago
Pierre Bondoerffer 8a56adfe53
make logos same size, compress 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
Caleb James DeLisle 0f7124d673 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer ecc766eb7b
remove useless margin 7 years ago
Caleb James DeLisle a6547d1ed0 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer 7310960f46
remove the hack around the hack to fix the hack 7 years ago
Caleb James DeLisle 95c7cd3fcc Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer addd91cc72
fix styles (again) copyright cjd 2017 7 years ago
Caleb James DeLisle 930ba8aec6 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer 5c21a9048e
fix styles 7 years ago
Caleb James DeLisle b26c62714f Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer c953e71a18
better class generation and remove duplicate class 7 years ago
Caleb James DeLisle 4d563af045 Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 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
ansuz 96b12d55fb add a return 7 years ago
ansuz b79adf4177 redirect to drive if logged in 7 years ago
Caleb James DeLisle a10214ed2a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 7 years ago
Caleb James DeLisle 75c0876500 Added ludovic's bio 7 years ago
CatalinScr 043ae4280b repaired the menu 7 years ago
CatalinScr 250d85bb8a Repaired the menu, clead the code 7 years ago
Pierre Bondoerffer e2ad99ab3c
change favicon (again) 7 years ago
Pierre Bondoerffer 8831f4f91b
new favicons 7 years ago
Pierre Bondoerffer a70c527482
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page 7 years ago
Pierre Bondoerffer 4018c7e0a6
move alertify stuff 7 years ago
Caleb James DeLisle c274a27dfb Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js 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
Pierre Bondoerffer 1b83e15796
sorry jpg, i forgot you existed 7 years ago
Pierre Bondoerffer 5ce7d64b2c
add pierre photo 7 years ago
Caleb James DeLisle 1b466d250f Add some photos 7 years ago
Caleb James DeLisle 5d70dd93b3 Manual merge 7 years ago
CatalinScr 15fa801bc8 work in progress 7 years ago
Caleb James DeLisle bc15ce7de5 Manual merge 7 years ago
Caleb James DeLisle 52e9ba92fa Update whitepaper link and also change whatis_zeroknowledge 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 cdf6345fc1
use sign up 7 years ago
Pierre Bondoerffer ddc9c4d070
alt favicon pink 7 years ago
ansuz 35867001cb add missing messages 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 b3f3f1dabb
Add What is CryptPad keys 7 years ago
Pierre Bondoerffer e2f8c9c5da
add logo to topbar 7 years ago
Pierre Bondoerffer 8a56029bfe
remove useless images 7 years ago
Pierre Bondoerffer ea3a8932be
put the content in the right place 7 years ago
Pierre Bondoerffer 262a729ef7
use proper key name 7 years ago
Pierre Bondoerffer db111257f0
Add translations, remove useless functions 7 years ago
Pierre Bondoerffer de23195bd8
fix wrong css class 7 years ago
Pierre Bondoerffer ad4aca4e5f
actually do the changes intended in previous commit 7 years ago
Pierre Bondoerffer 01b2883771
Add headers and footers, generate what-is-cryptpad 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 5ef0325d90 this are css rules modified -- INSERT -- 7 years ago
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more 7 years ago
Pierre Bondoerffer ba95931802
Use translation keys 7 years ago
ansuz 9a733cca0e drop support for legacy iframe 7 years ago
Pierre Bondoerffer f2a78ddfd9
New FR/ES keys 7 years ago
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive 7 years ago
ansuz 1ca00e7e01 resolve merge conflicts 7 years ago
ansuz 411c64df85 Merge branch 'master' into master 7 years ago
Pierre Bondoerffer 93e007b52a
reduce png sizes 7 years ago
ansuz 777dea2014 Merge branch 'staging' into todo 7 years ago
ansuz a458d7fa46 bump to latest version 7 years ago
Caleb James DeLisle 428bee6306 make links clickable and make more link work 7 years ago
ansuz ba9cab762c Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 7 years ago
yflory 459e0b3b16 CSS and bug fixes for todo 7 years ago
ansuz a5b19b1cdd add missing translations 7 years ago
yflory 77d6da841f Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 7 years ago
yflory 3da76e3ae8 Update style for the todo app 7 years ago
ansuz 8cfd8d3270 add translations for todo 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
c4rl0sc 2e8e44933a Fixed spelling error in Spanish translation 7 years ago
ansuz dcf5719eaf handle most of the boilerplate stuff 7 years ago
c4rl0sc 064e189495 Fixed spelling issues and improved translation quality. 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