dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,606 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

246 Commits

Author SHA1 Message Date
yflory 8ced81d8d7 lint compliance 2018-01-12 17:45:52 +01:00
ansuz a018b7db9e only show availablePadTypes on the home page 2018-01-12 17:39:36 +01:00
ansuz e06cb29c4f bump version 2018-01-08 18:40:51 +01:00
ansuz e460d9c36c bump version 2018-01-02 10:38:49 +01:00
ansuz 127f30df72 bump CryptPad version 2017-12-19 10:56:22 +01:00
ansuz 8150abddbe remove dead code from pages.js 2017-11-21 15:52:37 +01:00
ansuz 4ffb59dce9 bump to version 1.21.0 2017-11-21 15:47:06 +01:00
ansuz 78e972201a bump CryptPad version 2017-11-20 14:16:55 +01:00
yflory 101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
ansuz 402fae442d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-06 15:14:21 +01:00
ansuz c5f6491c37 bump footer and package.json to latest version 2017-11-06 15:14:02 +01:00
yflory 4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
yflory 74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz aaef30f489 bump cryptpad version 2017-10-23 14:05:49 +02:00
yflory 2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
yflory 50090a3af6 Add placeholders for the comment form in poll 2017-10-12 12:18:32 +02:00
yflory ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +02:00
yflory c985aa60aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 17:30:14 +02:00
yflory f4189f883e Add missing french translation keys 2017-10-09 17:28:56 +02: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
ansuz f751554f82 update footer and package.json for upcoming version 2017-10-09 15:15:04 +02:00
yflory dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +02:00
yflory 5e7bf0cfb8 Embed an image in whiteboard 2017-10-09 10:32:24 +02:00
yflory 1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
yflory 26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory 846b1a9fb3 Improve description UI in poll. Enable tags and mediatag 2017-10-04 15:39:18 +02:00
yflory 68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
yflory 5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
yflory 66da349ee4 Sandboxed Poll app with less2 2017-09-27 18:52:04 +02:00
yflory 767027b237 Lint 2017-09-27 10:16:24 +02:00
yflory 0df9e5ace0 Fix toolbar in polls 2017-09-27 10:09:47 +02:00
ansuz 95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
yflory 35a313d6ee Make palette realtime 2017-09-19 11:20:20 +02:00
yflory 3023e8c855 Fix templates in whiteboard 2017-09-19 11:04:52 +02:00
yflory 732585ea7b Sandboxed iframe for the whiteboard app 2017-09-19 10:27:31 +02:00
yflory ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
ansuz ad591fba50 bump version 2017-09-12 14:04:30 +02:00
ansuz a6eb1444df add loading screen markup to register and login 2017-09-07 16:39:42 +02:00
ansuz 352d504944 avoid loading unnecessary files 2017-09-07 16:39:20 +02:00
ansuz 77bbb3add4 bump footer and package.json version string 2017-09-05 15:29:28 +02:00
CatalinScr 0ceb4cbbcb Updated the contact page with the new design 2017-08-31 16:26:20 +03:00
CatalinScr 83be769bb3 Merge branch 'master' into staging 
updated with new version
 2017-08-31 11:36:39 +03:00
CatalinScr ee325c1813 Repaired the errors from lint 2017-08-31 10:20:10 +03:00
CatalinScr f95f3f4f24 Updated the contact page 2017-08-31 10:04:40 +03:00
ansuz a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz 570ff75a6c update footer for latest version 2017-08-29 11:12:08 +02:00
ansuz 54eefd3d94 replace contacts with contacts2 2017-08-25 16:07:53 +02:00
ansuz 57d0c6c973 Merge branch 'new-messaging' into staging 2017-08-25 14:42:34 +02:00
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2 2017-08-24 13:54:55 +02:00
ansuz 89a13d4b21 work on contacts2 until feature parity is reached 2017-08-22 15:55:49 +02:00
CatalinScr 49f7e0d63b Changed the Social Media links to Pierre 2017-08-18 16:01:50 +03:00
CatalinScr 744fb407ae Updated the what is page 2017-08-16 15:53:10 +03:00
ansuz 46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:34:54 +02:00
Caleb James DeLisle 3df20760c4 Yann does not have a twitter account. 2017-08-16 11:36:14 +02:00
ansuz 8b5519ad29 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:31:09 +02:00
ansuz 2b7dcbe77c remove bs class that caused poor alignment sometimes 2017-08-16 11:30:56 +02:00
Caleb James DeLisle 4213d6de70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:29:59 +02:00
Caleb James DeLisle d6125d864c Added Yann's bio 2017-08-16 11:29:50 +02:00
ansuz 7537caf8fe make footer translateable 2017-08-16 10:51:08 +02:00
ansuz 8ee5e14a60 merge ui-integration 2017-08-16 10:20:05 +02:00
CatalinScr fd3fd945c8 Updated the Log in Page 2017-08-16 07:56:18 +03:00
CatalinScr 1f4d0a0a56 Repaired a bug 2017-08-16 06:56:08 +03:00
CatalinScr dd48cf7c90 updated the register page 2017-08-15 23:47:36 +03:00
CatalinScr 3960cd25f8 Updated the about page with the new design 2017-08-14 16:40:09 +03:00
ansuz 7f2b7fc287 show Your CryptDrive, if logged in. fix typos 2017-08-11 11:32:21 +02:00
Pierre Bondoerffer ef256e3849
go to homepage when on infopages 2017-08-10 15:17:34 +02:00
Caleb James DeLisle 1043e076a4 Merge branch 'ui-integration' into staging 2017-08-09 17:47:02 +02:00
CatalinScr 41c2f9bd83 Changed the footer, a modified the about page 2017-08-09 18:35:36 +03:00
Pierre Bondoerffer c036bb26be
use proper bootstrap class 2017-08-09 15:46:17 +02:00
Pierre Bondoerffer b34e252eda
improve whiteboard styles 2017-08-09 14:43:32 +02:00
Pierre Bondoerffer 8b2cb37c2f
improve poll looks 2017-08-09 12:33:40 +02:00
Pierre Bondoerffer 82352b422f
unhide show help button 2017-08-09 11:24:28 +02:00
Pierre Bondoerffer 355b7f1839
change recent to local pads 2017-08-08 12:05:22 +02:00
Pierre Bondoerffer 996c56c242
fix label in register 2017-08-07 11:41:04 +02:00
Pierre Bondoerffer e333e7903d
fix styles overlapping 2017-08-04 17:44:02 +02:00
CatalinScr 5afadf10aa Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 17:58:48 +03:00
CatalinScr 3f6b234e97 Styled the general menu, footer, updated about 2017-08-04 17:58:29 +03:00
Pierre Bondoerffer a16d4be3c4
show logged in user 2017-08-04 16:48:01 +02:00
Pierre Bondoerffer 7310960f46
remove the hack around the hack to fix the hack 2017-08-04 15:19:59 +02:00
Pierre Bondoerffer c953e71a18
better class generation and remove duplicate class 2017-08-04 15:06:58 +02:00
Caleb James DeLisle a10214ed2a Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-04 14:19:54 +02:00
Caleb James DeLisle 75c0876500 Added ludovic's bio 2017-08-04 14:19:44 +02:00
CatalinScr 250d85bb8a Repaired the menu, clead the code 2017-08-04 15:15:35 +03:00
Caleb James DeLisle c274a27dfb Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js 2017-08-04 11:33:28 +02:00
Caleb James DeLisle 0d1f19f5d4 Big manual merge 2017-08-04 11:20:17 +02:00
CatalinScr e7d09c1ddb Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 
changed the menu
 2017-08-04 12:16:33 +03:00
CatalinScr d4ce7d626c Modified the menu 2017-08-04 12:16:13 +03:00
Pierre Bondoerffer 1b83e15796
sorry jpg, i forgot you existed 2017-08-04 10:49:18 +02:00
Pierre Bondoerffer 5ce7d64b2c
add pierre photo 2017-08-04 10:30:19 +02:00
Caleb James DeLisle 1b466d250f Add some photos 2017-08-03 18:01:48 +02:00
Caleb James DeLisle 5d70dd93b3 Manual merge 2017-08-03 17:18:03 +02:00
CatalinScr 15fa801bc8 work in progress 2017-08-03 18:09:25 +03:00
CatalinScr 89ab82c0e2 Changed the menu, added the logo on top bar 2017-08-03 17:19:55 +03:00
Pierre Bondoerffer ae176b0465
about page mockup 2017-08-03 15:58:51 +02:00
Pierre Bondoerffer 86bc14e6bb
new loading screen 2017-08-02 17:19:16 +02:00
Pierre Bondoerffer d6679e8ef3
Add screenshots to What is CryptPad 2017-08-02 15:53:04 +02:00
Pierre Bondoerffer b3f3f1dabb
Add What is CryptPad keys 2017-08-02 14:57:27 +02:00
Pierre Bondoerffer e2f8c9c5da
add logo to topbar 2017-08-02 12:37:56 +02:00
Pierre Bondoerffer ea3a8932be
put the content in the right place 2017-08-02 11:50:35 +02:00
Pierre Bondoerffer 262a729ef7
use proper key name 2017-08-02 11:48:30 +02:00
Pierre Bondoerffer db111257f0
Add translations, remove useless functions 2017-08-02 11:46:55 +02:00
Pierre Bondoerffer de23195bd8
fix wrong css class 2017-08-02 11:26:02 +02:00
Pierre Bondoerffer ad4aca4e5f
actually do the changes intended in previous commit 2017-08-02 11:22:52 +02:00
Pierre Bondoerffer dc0a037894
turn login and register into infopages 2017-08-01 17:11:03 +02:00
Pierre Bondoerffer 549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page 2017-08-01 14:35:50 +02:00
Pierre Bondoerffer 775ea81504
start register page 2017-08-01 14:35:45 +02:00
CatalinScr 69c470330f updated the favicons, changed the menu 
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
 2017-08-01 15:21:07 +03:00
CatalinScr e609950977 Changed the favicon, added the boostrap js file, reconfigure the top menu 2017-08-01 15:20:29 +03:00
Caleb James DeLisle 27aa1886b1 Move footer to pages.js and add it to the contact page 2017-08-01 14:17:02 +02:00
Caleb James DeLisle cd2b41f51e Fix up some less for supporting the info-pages 2017-08-01 11:53:06 +02:00
CatalinScr 5ef0325d90 this are css rules modified -- INSERT -- 2017-07-31 19:14:15 +03:00
CatalinScr 5921073524 Updated the new font, changed the logo, changed see more 2017-07-31 19:13:45 +03:00
Pierre Bondoerffer ba95931802
Use translation keys 2017-07-31 17:53:31 +02:00
CatalinScr 6862bda454 Changed the logo, uploaded the new font, repaired responsive 2017-07-31 17:04:37 +03:00
Caleb James DeLisle 428bee6306 make links clickable and make more link work 2017-07-26 15:53:10 +02:00
CatalinScr cab8716519 Changed the login button, repaired the hover menu and see more. Updated the logo 2017-07-25 01:08:53 +03:00
CatalinScr 796bf89491 Update of the front-page 2017-07-24 17:56:54 +03:00
Caleb James DeLisle 49c760131e wip 2017-07-24 14:10:40 +02:00
ansuz dcf5719eaf handle most of the boilerplate stuff 2017-07-23 14:27:47 +02:00
Caleb James DeLisle 6a1ec54e2a wip 2017-07-22 17:31:40 +02:00
Pierre Bondoerffer dc9565f22f
make buttons colorful 2017-07-22 17:30:13 +02:00
Caleb James DeLisle 8404017af1 wip 2017-07-22 16:43:53 +02:00
Caleb James DeLisle ffb5e555a0 Merge branch 'staging' into front-page 2017-07-20 10:09:32 +02:00
ansuz f2320190b8 change friends url to /contacts/ 2017-07-17 17:18:28 +02:00
Caleb James DeLisle f6abdc2b86 manual merge of staging 2017-07-13 10:30:42 +02:00
yflory ac684a8dc7 Use the APP toolbar in profile 2017-07-12 18:34:16 +02:00
yflory 125018c8c3 New settings page 2017-07-10 18:29:23 +02:00
yflory 159d72f33b Merge branch 'msg' into staging 2017-07-10 11:48:22 +02:00
Ecaterina Moraru (Valica) fc065a0484 Issue #151: Spacing between "Log-in" and "Register" buttons 
- Removed ".first" class from Register button
- Increase spacing between buttons
 2017-07-07 17:04:26 +03:00
yflory a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
ansuz 4016a95540 prototype invite app 2017-07-05 16:01:50 +02:00
ansuz fa06f9d413 fix minor bugs in poll 2017-07-04 15:09:09 +02:00
Caleb James DeLisle 25905d13fa wip 2017-07-03 20:40:19 +02:00
Caleb James DeLisle fcff5fa009 wip 2017-07-02 16:51:21 +02:00
Caleb James DeLisle c25f2df721 Added caching versions to some of the images which are loaded by js 2017-06-30 12:11:44 +02:00
ansuz 7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00
ansuz bdca6b10c2 use templates in poll.js 2017-06-27 15:38:12 +02:00
ansuz 3a9b480e4e resolve merge conflicts in template.js 2017-06-27 14:28:28 +02:00
yflory 40f4fc2682 Add the profile app in template.js 2017-06-27 14:27:54 +02:00
ansuz e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00
ansuz f181e8db60 correct parentheses 2017-06-26 10:45:27 +02:00
ansuz 35bfa1dce4 test client-side templates in whiteboard app 2017-06-22 16:01:33 +02:00
ansuz e86ef209a8 define loading screen markup in js 2017-06-22 11:04:21 +02:00
ansuz 118b83c420 make register and login user clientside templates 2017-06-22 10:04:46 +02:00
ansuz 48f9745619 clientside templating 2017-06-21 18:02:38 +02:00