Commit Graph

261 Commits (d702cbf548de876740d13ddadfb63227209701a0)

Author SHA1 Message Date
ansuz bc3fe4f32c update version in footer and package.json
yflory 44cd235f48 Fix CSS with Bootstrap 4
yflory c9ed6d6bf8 New pad creation screen
yflory b1b9683141 Add links to FAQ and Privacy in static pages
ansuz 1452d65bd4 fix missing section in privacy policy
yflory b0dba481d8 Fix small UI issues and IE issues
yflory f0bc1cfe99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory 60b2384885 Move initial state into a help block
ansuz 66d83dc045 update version
yflory 299a2f4c08 FAQ placeholder
ansuz 11fabea327 update footer and package.json version
yflory 462c229b17 Add links to features table
yflory 166a9e71cf Add a features comparison page
ansuz 4f42e8a282 bump to version 1.25.0
yflory f3d8fd3590 Ability to import local pads on login
yflory 8ced81d8d7 lint compliance
ansuz a018b7db9e only show availablePadTypes on the home page
ansuz e06cb29c4f bump version
ansuz e460d9c36c bump version
ansuz 127f30df72 bump CryptPad version
ansuz 8150abddbe remove dead code from pages.js
ansuz 4ffb59dce9 bump to version 1.21.0
ansuz 78e972201a bump CryptPad version
yflory 101482b8cc Migrate settings to use a sandboxed iframe
ansuz 402fae442d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz c5f6491c37 bump footer and package.json to latest version
yflory 4250688856 Migrate profile to use sframe
yflory 74985fd0f2 Use text for the addUser button in polls
ansuz aaef30f489 bump cryptpad version
yflory 2fd120100a Merge branch 'wb' into staging
yflory 50090a3af6 Add placeholders for the comment form in poll
yflory ecb537ac7f Move code to render.js in poll
yflory c985aa60aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
yflory f4189f883e Add missing french translation keys
ansuz 128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
CatalinScr 21f1a48380 changed the login in button
ansuz f751554f82 update footer and package.json for upcoming version
yflory dd141b5c9f Disable comments when a poll is not published
yflory 5e7bf0cfb8 Embed an image in whiteboard
yflory 1c4f1c785d Improve stability and UI in poll and its comments
yflory 26dfc65c25 Comments in polls
yflory 846b1a9fb3 Improve description UI in poll. Enable tags and mediatag
yflory 68bda92291 Use codemirror for description in poll
yflory 5cf86bf74a Update UI in poll and remove old code
yflory 66da349ee4 Sandboxed Poll app with less2
yflory 767027b237 Lint
yflory 0df9e5ace0 Fix toolbar in polls
ansuz 95302366d1 lint compliance
yflory 35a313d6ee Make palette realtime
yflory 3023e8c855 Fix templates in whiteboard
yflory 732585ea7b Sandboxed iframe for the whiteboard app
yflory ab64bf9e59 Use less2 for the loading screen
ansuz ad591fba50 bump version
ansuz a6eb1444df add loading screen markup to register and login
ansuz 352d504944 avoid loading unnecessary files
ansuz 77bbb3add4 bump footer and package.json version string
CatalinScr 0ceb4cbbcb Updated the contact page with the new design
CatalinScr 83be769bb3 Merge branch 'master' into staging
updated with new version
CatalinScr ee325c1813 Repaired the errors from lint
CatalinScr f95f3f4f24 Updated the contact page
ansuz a34d1793e0 drop 'loading' text from loading screen
ansuz 570ff75a6c update footer for latest version
ansuz 54eefd3d94 replace contacts with contacts2
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2
ansuz 89a13d4b21 work on contacts2 until feature parity is reached
CatalinScr 49f7e0d63b Changed the Social Media links to Pierre
CatalinScr 744fb407ae Updated the what is page
ansuz 46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle 3df20760c4 Yann does not have a twitter account.
ansuz 8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
ansuz 2b7dcbe77c remove bs class that caused poor alignment sometimes
Caleb James DeLisle 4213d6de70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
Caleb James DeLisle d6125d864c Added Yann's bio
ansuz 7537caf8fe make footer translateable
ansuz 8ee5e14a60 merge ui-integration
CatalinScr fd3fd945c8 Updated the Log in Page
CatalinScr 1f4d0a0a56 Repaired a bug
CatalinScr dd48cf7c90 updated the register page
CatalinScr 3960cd25f8 Updated the about page with the new design
ansuz 7f2b7fc287 show Your CryptDrive, if logged in. fix typos
Pierre Bondoerffer ef256e3849
go to homepage when on infopages
Caleb James DeLisle 1043e076a4 Merge branch 'ui-integration' into staging
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page
Pierre Bondoerffer c036bb26be
use proper bootstrap class
Pierre Bondoerffer b34e252eda
improve whiteboard styles
Pierre Bondoerffer 8b2cb37c2f
improve poll looks
Pierre Bondoerffer 82352b422f
unhide show help button
Pierre Bondoerffer 355b7f1839
change recent to local pads
Pierre Bondoerffer 996c56c242
fix label in register
Pierre Bondoerffer e333e7903d
fix styles overlapping
CatalinScr 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
CatalinScr 3f6b234e97 Styled the general menu, footer, updated about
Pierre Bondoerffer a16d4be3c4
show logged in user
Pierre Bondoerffer 7310960f46
remove the hack around the hack to fix the hack
Pierre Bondoerffer c953e71a18
better class generation and remove duplicate class
Caleb James DeLisle a10214ed2a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Caleb James DeLisle 75c0876500 Added ludovic's bio
CatalinScr 250d85bb8a Repaired the menu, clead the code
Caleb James DeLisle c274a27dfb Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
Caleb James DeLisle 0d1f19f5d4 Big manual merge
CatalinScr e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
CatalinScr d4ce7d626c Modified the menu
Pierre Bondoerffer 1b83e15796
sorry jpg, i forgot you existed
Pierre Bondoerffer 5ce7d64b2c
add pierre photo
Caleb James DeLisle 1b466d250f Add some photos
Caleb James DeLisle 5d70dd93b3 Manual merge
CatalinScr 15fa801bc8 work in progress
CatalinScr 89ab82c0e2 Changed the menu, added the logo on top bar
Pierre Bondoerffer ae176b0465
about page mockup
Pierre Bondoerffer 86bc14e6bb
new loading screen
Pierre Bondoerffer d6679e8ef3
Add screenshots to What is CryptPad
Pierre Bondoerffer b3f3f1dabb
Add What is CryptPad keys
Pierre Bondoerffer e2f8c9c5da
add logo to topbar
Pierre Bondoerffer ea3a8932be
put the content in the right place
Pierre Bondoerffer 262a729ef7
use proper key name
Pierre Bondoerffer db111257f0
Add translations, remove useless functions
Pierre Bondoerffer de23195bd8
fix wrong css class
Pierre Bondoerffer ad4aca4e5f
actually do the changes intended in previous commit
Pierre Bondoerffer dc0a037894
turn login and register into infopages
Pierre Bondoerffer 549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
Pierre Bondoerffer 775ea81504
start register page
CatalinScr 69c470330f updated the favicons, changed the menu
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
CatalinScr e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu
Caleb James DeLisle 27aa1886b1 Move footer to pages.js and add it to the contact page
Caleb James DeLisle cd2b41f51e Fix up some less for supporting the info-pages
CatalinScr 5ef0325d90 this are css rules modified -- INSERT --
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more
Pierre Bondoerffer ba95931802
Use translation keys
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive
Caleb James DeLisle 428bee6306 make links clickable and make more link work
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo
CatalinScr 796bf89491 Update of the front-page
Caleb James DeLisle 49c760131e wip
ansuz dcf5719eaf handle most of the boilerplate stuff
Caleb James DeLisle 6a1ec54e2a wip
Pierre Bondoerffer dc9565f22f
make buttons colorful
Caleb James DeLisle 8404017af1 wip
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page
ansuz f2320190b8 change friends url to /contacts/
Caleb James DeLisle f6abdc2b86 manual merge of staging
yflory ac684a8dc7 Use the APP toolbar in profile
yflory 125018c8c3 New settings page
yflory 159d72f33b Merge branch 'msg' into staging
Ecaterina Moraru (Valica) fc065a0484 Issue : Spacing between "Log-in" and "Register" buttons
- Removed ".first" class from Register button
- Increase spacing between buttons
yflory a5e8f6ae81 Add friend app and fix avatar size
ansuz 4016a95540 prototype invite app
ansuz fa06f9d413 fix minor bugs in poll
Caleb James DeLisle 25905d13fa wip
Caleb James DeLisle fcff5fa009 wip