Commit Graph

1935 Commits (88dcadcb1b561bfc6297b7bb7aad20a3f785e925)

Author SHA1 Message Date
yflory 29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +02:00
ansuz 577dea4c75 clientside implementation of block signing and encryption 2018-06-19 16:38:49 +02:00
yflory b89b033175 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-14 17:18:56 +02:00
yflory 54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
Catalin e9e461c4d6 Repaired some responsive issues on about page, contact and features 2018-06-13 11:12:56 +03:00
ansuz ff25929c18 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-12 15:50:53 +02:00
ansuz 54b52d681c fix broken share menu resulting from adblock plus triggered by 'share' 2018-06-12 15:50:41 +02:00
yflory 01a3c13a8c Fix CSP issues for missing files (404) 2018-06-12 15:15:46 +02:00
yflory 4304079c70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-12 14:02:13 +02:00
yflory f72e14b1b9 Add/fix translatons keys for the features "table" 2018-06-12 14:01:57 +02:00
ansuz 06582e06dc update markup in de translation 2018-06-12 12:03:25 +02:00
ansuz aa51463a9a Merge branch 'soon' into staging 2018-06-12 12:00:51 +02:00
ansuz 4701a7f415 Merge branch 'features-page' into staging 2018-06-12 11:48:43 +02:00
ansuz 6e6020ef0d rename and optimize images: thanks @MacLemon 2018-06-12 11:42:25 +02:00
ansuz eb49f53884 standardize indentation 2018-06-12 11:32:09 +02:00
ansuz 8def11bea3 define style by class instead of structure 2018-06-12 11:21:12 +02:00
yflory c803b70a1a Fix translations 2018-06-11 18:24:20 +02:00
yflory 4dec2cca5c Translations for new version detected 2018-06-11 18:18:39 +02:00
ansuz 9e4fdb7e83 prefix classes with cp 2018-06-11 16:35:19 +02:00
ansuz 5a549f75a6 increment version 2018-06-11 15:15:03 +02:00
ansuz 756681211b update home page icons, allow for customization 2018-06-08 17:06:50 +02:00
ansuz 5ae7cdb1e6 add missing key for french translation 2018-06-08 14:56:11 +02:00
ansuz b0039e35d0 add missing translation key for kanban 2018-06-08 14:38:44 +02:00
yflory 2e15d59081 Fix typo 2018-06-07 10:21:45 +02:00
yflory 8586d0c944 Merge branch 'staging' into donkey 2018-05-31 13:28:14 +02:00
yflory ba0e000808 Add a file upload modal 2018-05-31 13:27:44 +02:00
yflory fe202a92b4 Fix UI issues in kanban 2018-05-30 15:15:50 +02:00
yflory 3af997db2b Kanban translation 2018-05-30 10:36:26 +02:00
yflory 66655b4a23 Upload a file with a password 2018-05-28 17:50:28 +02:00
yflory 0e9bd156b1 Update footer 2018-05-28 12:07:12 +02:00
yflory 6bd5d698b5 Add kanban help 2018-05-28 12:05:13 +02:00
yflory 598960d960 Disable language selector in static pages 2018-05-28 11:02:39 +02:00
yflory 95218f0fa1 Remove use of space-evenly since it is not supported by all browsers 2018-05-24 16:09:33 +02:00
yflory 7800fa2dcd Add confirm dialog when deleting a task in kanban + add colors 2018-05-23 17:13:41 +02:00
yflory fe27c97879 Help + tooltips + fix colors in kanban 2018-05-23 14:24:23 +02:00
yflory 365b32d378 Fix home page header colors 2018-05-22 15:48:59 +02:00
yflory dfd7e7ed9b Fix moving UI when hovering a link in the static pages' header 2018-05-22 15:40:06 +02:00
yflory ff17a0aad6 Add language selector in static pages' footer 2018-05-22 15:26:35 +02:00
yflory 5887ff1a6d Fix typo 2018-05-22 15:26:18 +02:00
yflory 090d266d31 Translations for the about page 2018-05-22 15:00:16 +02:00
ansuz 2170fcb9ad Merge branch 'kanban' into staging 2018-05-18 10:19:55 +02:00
ansuz 57f2e26d8a Merge branch 'staging' into soon 2018-05-17 11:00:37 +02:00
ansuz 534d5ae006 bump version 2018-05-17 10:41:17 +02:00
yflory 73183a69fd Improve kanban UI 2018-05-16 19:28:30 +02:00
yflory 86be9abb62 Translations for kanban 2018-05-16 16:45:16 +02:00
yflory b6ebc583ba Add the kanban app to the list 2018-05-16 16:30:37 +02:00
yflory 037050d16f Merge branch 'coati' into kanban 2018-05-16 11:41:55 +02:00
yflory 65a2083afc Suggest tags based on existing ones. Display existing tags in the drive. 2018-05-15 18:18:56 +02:00
yflory 6fde15247b Fix UI issues in the loading screen with the loading bar 2018-05-14 14:02:46 +02:00
Paul Libbrecht 96a71afbc9 Translating one extra line. 2018-05-11 09:53:20 +02:00
Paul Libbrecht 372f1dfeb4 First anchor test and restore of the CKEditor anchor function. 2018-05-11 09:06:22 +02:00
yflory 4d5606e757 Add missing file for password inputs 2018-05-04 18:42:07 +02:00
yflory 2d2701596a Loading message and loading bar for migration 2018-05-04 18:41:54 +02:00
yflory d6d53e4068 Bump drive version for new users 2018-05-04 15:48:55 +02:00
yflory 2b8e734cae Add revealable password input to display or prompt the password 2018-05-04 15:42:29 +02:00
yflory cfe8b67142 Fix overflowing words in tippy 2018-05-03 18:25:44 +02:00
yflory cfcf791efc Break long words in tooltips 2018-05-03 15:26:46 +02:00
yflory 10ce95087a Merge branch 'password' into staging 2018-05-03 15:16:03 +02:00
Catalin Scripcariu 09e549971b repaired a small bug 2018-05-02 18:11:20 +03:00
Catalin Scripcariu 3f071d87ea Design for the pages Features, FAQ and Privacy 2018-05-02 17:41:04 +03:00
ansuz 3eb199bca7 bump version to 2.0.0 2018-05-02 11:44:12 +02:00
ansuz 123612b893 Merge branch 'de-translation-pl' into staging 2018-05-02 11:09:22 +02:00
ansuz 8b13bd0be5 lint compliance and merge 2018-05-02 11:07:28 +02:00
ansuz de768869eb add missing semicolons 2018-05-02 10:56:02 +02:00
yflory eefa70ffa4 Fix typo in the french translation 2018-05-02 10:10:46 +02:00
yflory 009eb13fc3 Merge branch 'master' into staging 2018-04-27 17:51:12 +02:00
yflory b21f42747d Fix color and scroll issues in the PCS 2018-04-27 17:49:04 +02:00
yflory 389c197441 Fix color issue in file upload table 2018-04-27 17:48:42 +02:00
yflory 64c85fe548 Don't return channel in parsePadUrl 2018-04-27 17:23:23 +02:00
Paul Libbrecht 662f69eb0c Usage of the informal form mainstreamed. paul 2018-04-26 18:59:30 +02:00
yflory 1879c1829c Add passwod prompt to access protected pads 2018-04-25 19:03:58 +02:00
Paul Libbrecht 26124791a1 First stab at updating the German translation.
More proofreading and discussion is needed to polish it.
paul
2018-04-21 09:28:19 +02:00
yflory a773c47950 Fix loading screen in login and register 2018-04-19 14:21:26 +02:00
yflory 9f5e5786f3 Merge branch 'pcs' into staging 2018-04-19 11:14:56 +02:00
yflory e1d59db30d Fonts issues on Windows 2018-04-19 11:14:22 +02:00
yflory 206ac14438 Prevent users from creating a pad when visiting a deleted profile (read-only mode) 2018-04-18 18:54:46 +02:00
yflory caf86dd9b7 Improve static pages UI 2018-04-18 18:51:49 +02:00
yflory 5c2ee778ad Initialize new users' drive to the latest version 2018-04-18 18:50:46 +02:00
yflory c190a38a6b Fix UI issues 2018-04-18 14:19:45 +02:00
yflory e21e9b9d9f Trigger change event when using keyboard shortcut on custom checkbox 2018-04-17 18:48:06 +02:00
yflory 24dfaf766d View more templates 2018-04-17 18:23:58 +02:00
yflory 842952fe1f New checkboxes and radio input everywhere 2018-04-17 15:51:03 +02:00
yflory 68c26f3164 Custom radio inputs 2018-04-16 19:07:57 +02:00
yflory 7870dc05ca Fix notification timeout 2018-04-16 16:07:40 +02:00
yflory 54dd339826 Fix invisible selection in the pad creation modal 2018-04-16 16:01:13 +02:00
yflory 881c36214f Lint compliance 2018-04-16 15:57:18 +02:00
yflory e2b9cf1c40 Fix small UI issues with the new colortheme 2018-04-16 15:46:19 +02:00
yflory 52d6c9d468 New colortheme for alertify logs and modals 2018-04-13 17:47:33 +02:00
yflory 5ee5a93513 New tippy everywhere 2018-04-13 15:25:14 +02:00
yflory 9d57548f1d New tooltips 2018-04-12 19:08:08 +02:00
ansuz a4674e40e1 fix bug in register page which locks up the registration form 2018-04-12 14:33:47 +02:00
yflory 4a23b57655 New loading screen 2018-04-11 18:56:03 +02:00
ansuz 92fe555cb5 update footer and package.json 2018-04-04 15:02:28 +02:00
yflory 0dfae72f88 Lock the UI for unregistered users 2018-04-03 12:04:49 +02:00
yflory cf22c58e39 Missing translations 2018-04-03 11:23:58 +02:00
Ludovic Dubost ee8651c74e Kanban styles and color updating 2018-04-02 20:33:35 +02:00
Ludovic Dubost 035a56fdab Kanban application using the cryptpad framework 2018-04-02 20:27:52 +02:00
Ludovic Dubost 4b83f2991a Kanban prototype on cryptpad 2018-04-01 18:52:21 +02:00
yflory 1a950319a1 Fix broken links 2018-03-23 15:05:26 +01:00
yflory 0c2987a6d1 Import template in existing pads 2018-03-22 17:01:01 +01:00
yflory d4dfbddaa6 Add icons in the user menu 2018-03-22 15:19:14 +01:00
yflory 9e711e4cd4 Remove Bootstrap's JS in static pages 2018-03-22 10:49:20 +01:00
yflory 4288f536f1 Use requireCSS to load FontAwesome 2018-03-21 18:31:53 +01:00
yflory a718603b36 Automatic account deletion 2018-03-21 18:27:20 +01:00
ansuz a794efe931 Merge branch 'staging' into oo 2018-03-21 11:32:59 +01:00
ansuz bc3fe4f32c update version in footer and package.json 2018-03-20 11:14:55 +01:00
yflory 28d13186af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-20 11:05:56 +01:00
yflory 44cd235f48 Fix CSS with Bootstrap 4 2018-03-20 11:05:43 +01:00
ansuz 11b0781717 delete unused code 2018-03-20 10:44:26 +01:00
yflory 2704ee1ed7 Account deletion translations 2018-03-19 18:14:00 +01:00
yflory 8970bae647 Center pad type in the creation screen 2018-03-19 17:30:01 +01:00
yflory 4f2a91b82d Pad creation screen UI improvements 2018-03-19 16:17:19 +01:00
yflory ab8306f5d4 Merge branch 'soon' into staging 2018-03-14 17:17:00 +01:00
yflory ebef99e5cf Owned drive 2018-03-14 16:32:17 +01:00
yflory 03bcd2f00d Lint compliance 2018-03-14 12:12:24 +01:00
yflory 3eec812aff Merge branch 'staging' into creation 2018-03-14 12:07:04 +01:00
yflory e977b14c1b Update French translation 2018-03-14 11:50:17 +01:00
yflory b1d5beca6f Translations + UI for pad creation screen v2 2018-03-14 11:37:49 +01:00
yflory e56d762409 Catch chainpad errors and display it in the UI 2018-03-13 14:38:56 +01:00
yflory c9ed6d6bf8 New pad creation screen 2018-03-13 11:31:08 +01:00
ansuz 7dc7d5d950 lint compliance 2018-03-09 12:12:47 +01:00
ansuz 7944bc1a82 merge staging branch 2018-03-09 12:08:18 +01:00
yflory 7c99397e60 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-09 10:05:39 +01:00
ansuz 5f08ad2ea1 fix mangled 404 translation 2018-03-08 16:27:41 +01:00
yflory 643fcc4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 16:15:39 +01:00
yflory 2f262b12c6 Fix help box issues 2018-03-08 16:15:26 +01:00
ansuz 34d5c04eb4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 16:08:33 +01:00
ansuz 7091dfb669 standardize naming for the drawer, and reorder poll description 2018-03-08 16:05:47 +01:00
yflory 442f15df98 Add help text in all the apps + french translation 2018-03-08 15:39:46 +01:00
ansuz 82329dbe70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 15:06:30 +01:00
ansuz ec19b82609 add new help text 2018-03-08 15:06:22 +01:00
yflory b1b9683141 Add links to FAQ and Privacy in static pages 2018-03-08 12:17:19 +01:00
yflory 2bcf28bb34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 18:24:09 +01:00
yflory eac10321ba Reduce toolbar height on mobiles 2018-03-07 18:24:01 +01:00
ansuz 71f519f982 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 17:49:57 +01:00
ansuz 4262c8e6e4 correct french grammar 2018-03-07 17:49:38 +01:00
ansuz c7e4db7f38 transcribe english faq 2018-03-07 17:48:44 +01:00
yflory f45023ed1f Remove connection lost popup when websocket connection is lost 2018-03-07 16:48:49 +01:00
yflory 6a7c86aee7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 15:08:17 +01:00
yflory 8cdad27ec4 French FAQ 2018-03-07 15:07:39 +01:00
ansuz 1452d65bd4 fix missing section in privacy policy 2018-03-07 12:08:02 +01:00
yflory 3fcdbcdbc5 Faq questions 2018-03-06 16:49:13 +01:00
yflory b0dba481d8 Fix small UI issues and IE issues 2018-03-02 18:33:43 +01:00
yflory 12bfcbe701 Add fixed order for rightside icons in the toolbar 2018-03-01 14:32:14 +01:00
yflory 2c90cb5907 Move help button in drawer and fix drawer style 2018-02-28 17:59:27 +01:00
yflory 753b7550ca Save button in the pad creation screen 2018-02-28 17:02:35 +01:00
yflory a4a6385e86 Add keyboard shortcuts for the Ctrl+E or Cmd+E modal 2018-02-28 16:38:28 +01:00
yflory f0bc1cfe99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-27 17:39:27 +01:00
yflory 60b2384885 Move initial state into a help block 2018-02-27 17:38:29 +01:00
ansuz 66d83dc045 update version 2018-02-27 15:13:39 +01:00
yflory 5c53868c3b Delete pads after 3 months of inactivity 2018-02-26 18:34:05 +01:00
yflory 22f130d948 Remove lag when displaying loading screen in login and register 2018-02-26 10:41:37 +01:00
yflory 7cb3282634 New apps for text, slide and spreadsheet 2018-02-19 18:52:57 +01:00
yflory 831c23b259 Merge branch 'staging' into oo 2018-02-19 12:11:58 +01:00
yflory 5d584625e4 FAQ pages 2018-02-19 12:11:45 +01:00
yflory 5c1e5a3f49 Merge branch 'staging' into oo 2018-02-19 12:11:06 +01:00
yflory 299a2f4c08 FAQ placeholder 2018-02-19 12:09:57 +01:00
ansuz 91437c558e fix weird messages 2018-02-16 17:06:11 +01:00
ansuz 11fabea327 update footer and package.json version 2018-02-16 16:13:01 +01:00
yflory 70e014cdfc Hide infinite spinner and disconnect modals when pad is deleted 2018-02-15 11:34:44 +01:00
yflory e83e589cf0 Kick from pad when an owned channel is deleted + whiteboard and poll 2018-02-14 19:41:07 +01:00
yflory 728a6a868d Manage expired channels 2018-02-13 18:20:13 +01:00
yflory 223ed73ae1 French translation for the pad creation screen 2018-02-09 15:47:52 +01:00
yflory 0b022af5db Fix style issues in IE and mobiles 2018-02-09 15:45:47 +01:00
yflory ea7a3c75fa Fix hidden content in the pad creation screen with smaller screen or zoom 2018-02-08 14:06:40 +01:00
yflory 81ea3b14d7 Fix usage bar position in the settings app 2018-02-08 12:29:00 +01:00
yflory f18917f0ac Fix race condition at registration 2018-02-08 12:24:34 +01:00
yflory b5bb83b700 lint compliance 2018-02-08 12:24:19 +01:00
yflory c210f097c0 Refactor login part two 2018-02-07 17:14:15 +01:00
yflory ff151869de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-07 13:08:12 +01:00
yflory 7ebfa43408 Improve assert translations to detect issues in objects (tips, type, etc.) 2018-02-07 13:08:03 +01:00
ansuz d676a5e7db Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords 2018-02-07 11:14:19 +01:00
ansuz a0ff3370a2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-07 10:27:24 +01:00
ansuz 218b1fb328 set messages.el.js to non-executable 2018-02-07 10:24:40 +01:00
ansuz a1f05e4bf1 update pad creation screen text 2018-02-07 10:24:04 +01:00
yflory 5bba9b6c39 Refactor login to remove duplicate code 2018-02-06 18:45:12 +01:00
yflory 4df4c48fbd Improve UI for pad creation screen 2018-02-06 17:36:37 +01:00
ansuz a281869bba make things actually work 2018-02-01 11:43:29 +01:00
ansuz 0672c2f41a implement a running diff 2018-02-01 11:09:24 +01:00
yflory f6926699bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 19:04:14 +01:00
yflory ad2cde4705 Add warning about anonymous drive in localStorage 2018-01-29 19:04:00 +01:00
yflory e80e8339c2 Typo in translation 2018-01-29 16:16:50 +01:00
ansuz de838a3184 fix usage bar styles 2018-01-29 16:12:35 +01:00
yflory 8294686f80 Fix assert translations for deprecated keys 2018-01-29 15:37:23 +01:00
yflory 8a1c04ff58 Missing french translation keys 2018-01-29 15:33:34 +01:00
yflory bdafc101c9 Ability to remove owned channels from the drive 2018-01-29 15:17:53 +01:00
yflory a1d9f44bbd Delete owned pads from server when removed from the owner's drive 2018-01-29 12:45:38 +01:00
yflory 5089f1206d Pad creation screen translations and link to settings 2018-01-29 10:38:00 +01:00
yflory 462c229b17 Add links to features table 2018-01-26 12:52:25 +01:00
yflory 86144eda22 Display a message about pads deleted from the server 2018-01-26 12:26:58 +01:00
yflory 4d0312115a Add a link to the account server for subscribers in settings 2018-01-25 12:09:20 +01:00
yflory 5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it 2018-01-25 11:06:58 +01:00
yflory 166a9e71cf Add a features comparison page 2018-01-23 19:03:31 +01:00
yflory 2995782079 Different colors for ok and cancel in alertify 2018-01-23 17:02:32 +01:00
yflory 8628f2831e Fix 404 page inside iframe 2018-01-23 15:53:00 +01:00
yflory 30c6ab4717 Add meta description tag 2018-01-23 15:17:06 +01:00
yflory c90ba890ca Add more configurable options and add a new way to use custom config 2018-01-22 16:56:37 +01:00
ansuz 02dbe9e458 enforce maxUploadSize 2018-01-18 12:19:58 +01:00
ansuz fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 10:32:27 +01:00
ansuz 04b862352f update style for usage bar 2018-01-18 10:31:56 +01:00
yflory 08ae327386 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-17 18:40:09 +01:00
yflory c5ebbe1a56 New share menu 2018-01-17 18:39:45 +01:00
ansuz 4f42e8a282 bump to version 1.25.0 2018-01-17 14:28:20 +01:00
ansuz 3858aa976a better warning in case of errors in /file/ 2018-01-16 16:52:06 +01:00
ansuz 4fc1079d67 translate some stuff 2018-01-15 17:43:58 +01:00
yflory f3d8fd3590 Ability to import local pads on login 2018-01-12 18:17:32 +01:00
yflory a5b75e0164 Fix default config for anynymous drive 2018-01-12 18:15:15 +01:00
yflory 8ced81d8d7 lint compliance 2018-01-12 17:45:52 +01:00
ansuz b630fb95e2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-12 17:39:43 +01:00
ansuz a018b7db9e only show availablePadTypes on the home page 2018-01-12 17:39:36 +01:00
yflory dffa117f4d lint compliance 2018-01-12 17:09:33 +01:00
yflory d59bc4612d Ability to disable the drive for anonymous users 2018-01-12 15:54:36 +01:00
yflory db0d2e161c Hide pad creation screen features if it is disabled in app config 2018-01-12 14:50:39 +01:00
yflory daef08a9b3 Add an advanced new pad modal 2018-01-12 09:50:11 +01:00
yflory c460e2820e Fix a 1px offset for the userlist in Firefox/Windows 2018-01-11 16:09:29 +01:00
yflory bd9c44dbb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-11 16:02:18 +01:00
yflory ef480fea79 Add a settings category for the pad creation screen 2018-01-11 16:02:05 +01:00
ansuz 5346afe51f step towards customizable login functionality 2018-01-11 15:55:57 +01:00
ansuz ae2517fcc6 remove dead code from home page 2018-01-11 15:55:56 +01:00
yflory 8c9490868b improve owned pads management in the drive 2018-01-10 17:57:40 +01:00
yflory 73126ed597 Display the owner and expiration time of a pad in the properties modal 2018-01-09 18:19:24 +01:00
yflory 65ccfe39ef Add a 'properties' button in pads to display pad data 2018-01-09 12:02:56 +01:00
ansuz e06cb29c4f bump version 2018-01-08 18:40:51 +01:00
yflory 0cea5f4596 Create an owned pad and view owned pads in the drive 2018-01-08 17:36:44 +01:00
yflory 1ec41f4e09 Ability to pick a background image in slides 2018-01-04 17:22:01 +01:00
ansuz 65e66dea08 resolve bad merge 2018-01-02 12:13:43 +01:00
ansuz e3c7e96d71 Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek 2018-01-02 12:11:07 +01:00
ansuz e460d9c36c bump version 2018-01-02 10:38:49 +01:00
yflory f329d65bc8 Ability to reduce the width of ckeditor 2017-12-22 18:01:15 +01:00
Christos Koulaxizis 7f3a08f0c2 Greek translation 2017-12-22 14:58:51 +02:00
yflory 888739e333 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 18:21:14 +01:00
yflory fa6106a6bb Use CSS to remove the loading screen 2017-12-21 18:21:10 +01:00
ansuz c0b5dc7536 make loading screen tip presence configurable 2017-12-21 18:09:49 +01:00
yflory 158ef58c6c Enable print plugin in ckeditor 2017-12-21 17:07:06 +01:00
ansuz c448c9035e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-19 11:03:43 +01:00
ansuz 127f30df72 bump CryptPad version 2017-12-19 10:56:22 +01:00
yflory e48f143842 Allow numbers in _getKey parameters 2017-12-19 10:51:30 +01:00
yflory d666e9e7ee Remove tag and filepicker buttons for anon users 2017-12-15 18:16:01 +01:00
yflory b06b2dbafc less lint compliance 2017-12-12 10:47:45 +01:00
yflory b1f1aa2340 Disable pad creation screen 2017-12-11 17:54:34 +01:00
yflory 34315b4500 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 17:17:24 +01:00
yflory c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
ansuz 16388a839c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 15:46:38 +01:00
ansuz 230f9524be new less linter rules and compliance 2017-12-11 15:05:58 +01:00
yflory 4e46d0daa5 Fix the 'New' button icon in the toolbar 2017-12-11 14:51:36 +01:00
yflory dcfccf88cd Merge branch 'creationpage' into staging 2017-12-11 12:21:21 +01:00
yflory 1922dbfd75 Creation page with mobile support 2017-12-11 12:19:44 +01:00
Caleb James DeLisle 024aa741a7 Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant 2017-12-08 19:12:34 +01:00
Caleb James DeLisle 1d2119b292 Removed LESS duplicate attributes 2017-12-08 18:13:35 +01:00
Caleb James DeLisle bfba239770 Fixed missing semicolons in less 2017-12-08 17:35:28 +01:00
Caleb James DeLisle 9af941741d Fix trailing whitespace and empty selectors in less 2017-12-08 17:30:45 +01:00
Caleb James DeLisle dd44b4da99 Removed old /less/ directory which is nolonger used :) 2017-12-08 14:56:13 +01:00
Caleb James DeLisle 12b0f3e201 Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window 2017-12-08 14:00:53 +01:00
Caleb James DeLisle 617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
yflory e96d54e655 Add a pad creation page 2017-12-07 18:51:50 +01:00
Caleb James DeLisle 67f8031beb Wrong usage of colortheme.less, fixed 2017-12-07 14:57:24 +01:00
yflory 64303b4090 Merge branch 'refactor' into staging 2017-12-07 10:34:15 +01:00
Caleb James DeLisle ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-05 18:32:29 +01:00
Caleb James DeLisle 1dabea84d9 Overrides to colortheme.less will nolonger block the adding of new keys to the original file 2017-12-05 18:32:23 +01:00
Caleb James DeLisle c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
ansuz 087eee55f6 update 404 page 2017-12-04 18:31:07 +01:00
ansuz f95669a27a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 17:33:13 +01:00
ansuz fc4fea9c54 update 404 messages and show actual text faster 2017-12-04 17:33:06 +01:00
yflory f52d987515 Ability to resize avatars before uploading them 2017-12-04 15:03:43 +01:00
yflory e164edec03 Fix the webworker app 2017-12-01 18:29:59 +01:00
yflory 04e02871bc Merge branch 'refactor2' into staging 2017-12-01 14:50:19 +01:00
yflory 4903bd0757 Enable messenger in async store 2017-12-01 14:49:21 +01:00
ansuz 5acbaef28f tweak animation parameters for faster 'decryption' 2017-12-01 14:03:13 +01:00
ansuz c80c97d7db lint compliance 2017-12-01 13:23:23 +01:00
ansuz bcdc0d810a make 404 page translateable, point to home page or drive 2017-12-01 11:51:04 +01:00
ansuz 443eeaa407 fancy 404 page 2017-11-30 19:17:59 +01:00
yflory acd8ab7446 Add the markdown toolbar in profile 2017-11-27 18:10:37 +01:00
yflory 74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
yflory 9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory 280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
yflory cdd8c6e110 Fix history mode not centered 2017-11-21 17:48:43 +01:00
yflory 30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-21 17:37:53 +01:00
yflory 06011065d2 Add a debug app 2017-11-21 17:37:38 +01:00
ansuz 60c4973d62 resolve merge conflicts 2017-11-21 17:22:06 +01:00
yflory 477f14bb8b Put constants in a separate file 2017-11-21 16:46:19 +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
yflory e8e90905e4 Fix assert translations 2017-11-20 14:23:56 +01:00
ansuz 78e972201a bump CryptPad version 2017-11-20 14:16:55 +01:00
yflory ce3600b026 Update translation keys 2017-11-20 10:41:27 +01:00
yflory cf26c4c286 Improve the toolbar UI for smaller screens 2017-11-17 18:21:45 +01:00
yflory af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory 25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +01:00
yflory 1f53304ad3 Display a dropdown menu inside another one 2017-11-15 15:35:28 +01:00
yflory 014e12b5b5 Ability to update the username from the userlist 2017-11-15 11:32:54 +01:00
yflory 9184dd0ce6 Merge branch 'refactor2' into staging 2017-11-14 11:53:13 +01:00
yflory 5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory af1ea4fd96 Fix typo in the French translation 2017-11-13 16:34:37 +01:00
yflory c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
yflory 354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
yflory 101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
yflory 2ff66e1a7c Update french translation 2017-11-06 17:39:41 +01:00
ansuz 2c9df23849 update english text for removing from trash in the drive 2017-11-06 17:37:29 +01:00
ansuz d10f752457 s/delete/move to trash 2017-11-06 17:07:37 +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 2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
yflory 1871749b6f Fix -1 viewer in the userlist when disconnected 2017-11-03 15:14:23 +01:00
yflory cf3024ef5b Ability to display an error in the toolbar state 2017-11-03 14:30:59 +01:00
yflory e0f7df80b3 Fix avatar upload and use less2 everywhere in profile 2017-10-31 11:11:29 +01:00
yflory 7f9b21405b Add missing files for profile 2017-10-31 10:27:41 +01:00
yflory 4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
yflory abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 15:12:29 +01:00
yflory 68accaf653 Todo in sframe with less2 2017-10-30 15:12:15 +01:00
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
yflory 6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
ansuz 69f9a7ebf3 make userlist change notifications configurable 2017-10-24 17:29:58 +02:00
yflory 204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 15:17:09 +02:00
yflory 74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz 7d1892546b add missing french translation 2017-10-23 14:59:14 +02:00
ansuz 2e5fdf709a Merge branch 'soon' into staging 2017-10-23 14:29:01 +02:00
ansuz aaef30f489 bump cryptpad version 2017-10-23 14:05:49 +02:00
yflory ce5d24a1d3 Remove error message about Tether 2017-10-23 11:57:10 +02:00
ansuz d571f408d8 Merge pull request #185 from MacLemon/reduce-image-asset-size
Compressed images for faster connections
2017-10-23 11:46:56 +02:00
yflory 3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +02:00
Yannick A 63dcfd6d18 Update French translation 2017-10-19 21:02:03 +02:00
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework 2017-10-18 11:42:31 +03:00
yflory e553351b79 Put the add friend button in the userlist below the name 2017-10-17 12:39:25 +02:00
yflory 6920129126 Embed images from the drive in whiteboard 2017-10-17 12:19:57 +02:00
MacLemon 867b971c33 Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections. 2017-10-14 00:31:31 +02:00
yflory 2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
Caleb James DeLisle 15337603bb Merge branch 'staging' into framework 2017-10-13 13:41:24 +03:00
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory 62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +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
ansuz d046b9ce33 add missing French key 2017-10-09 17:16:48 +02:00
ansuz f0bdc3b26f second try 2017-10-09 16:57:30 +02:00
ansuz d50a692986 add note about tags to prompt 2017-10-09 16:51:57 +02:00
CatalinScr 21f1a48380 changed the login in button 2017-10-09 17:17:33 +03:00
yflory d3d6940b69 Update french translation for tags 2017-10-09 15:47:28 +02:00
ansuz 3f181fa370 update loading screen tip for tags 2017-10-09 15:38:33 +02: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
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework 2017-10-06 14:50:35 +03:00
yflory ab3648a30a Merge branch 'newpoll' into staging 2017-10-05 17:56:17 +02:00
yflory 1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
ansuz 080511efcd add missing translation for hashtags 2017-10-05 17:01:39 +02:00
Caleb James DeLisle d9e97b86e6 Merge branch 'staging' into framework 2017-10-05 12:14:37 +03:00
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. 2017-10-05 12:14:03 +03: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
ansuz e2f53eaddb add loading screen tip about hashtags 2017-10-03 18:39:03 +02:00
ansuz b8ce149db6 add hint about tag usage 2017-10-03 18:36:34 +02:00
yflory 5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
Caleb James DeLisle 94d2f4472b Stop using presentSuccess because it is hidden behind the modal in slide 2017-10-03 12:10:16 +03:00
ansuz 351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00
Caleb James DeLisle fa6938baa8 1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +03:00
yflory 66da349ee4 Sandboxed Poll app with less2 2017-09-27 18:52:04 +02:00
yflory e02a779c14 Use secure drive as default drive 2017-09-27 10:31:35 +02:00
yflory b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +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 b3e066eaca show loading screen tips during loading screen 2017-09-26 10:59:25 +02:00
yflory cdeac00633 Merge branch 'staging' into newdrive 2017-09-25 17:35:06 +02:00
yflory 1d7683503f Fix link origin in sframe upload table 2017-09-25 12:44:05 +02:00
yflory 92c808812a Fix missing style in toolbar/less2 2017-09-25 11:59:05 +02:00
yflory c364377d7c Use less2 in sframe drive 2017-09-25 11:48:42 +02:00
yflory dfdeb7b113 Fix style and race condition for history mode 2017-09-21 18:00:33 +02:00
yflory a810d7bd85 Fix style and race condition for history mode 2017-09-21 18:00:11 +02:00
yflory 456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
ansuz 95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
ansuz 53b98c12c9 ignore broken stylesheet 2017-09-20 11:33:30 +02:00
yflory 95542bcdaf Lint 2017-09-19 15:38:19 +02:00
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:36:38 +02:00
yflory 8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
ansuz d2b27f3588 resolve merge conflicts 2017-09-19 14:24:26 +02:00
ansuz f127240a2f add poll to main.less 2017-09-19 14:23:54 +02:00
yflory 6683434c62 Fix wrong relative url 2017-09-19 12:03:45 +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
ansuz f9d27d2783 WIP secure contacts 2017-09-18 15:09:01 +02:00
yflory 1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
yflory c00d295466 Add missing translations 2017-09-15 17:33:36 +02:00
yflory 974658453c Mediatag integration in pads 2017-09-15 13:21:37 +02:00
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 2017-09-14 10:48:35 +02:00
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 18:18:45 +02:00
ansuz e0ae0fcd91 thanks Dima! 2017-09-13 17:47:49 +02:00
ansuz f039fc7ff5 develop a system for avoiding z-index problems 2017-09-13 17:43:17 +02:00
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:20:26 +02:00
yflory ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
Caleb James DeLisle 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 14:47:55 +02:00
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 2017-09-13 14:47:50 +02:00
ansuz 244e3ecba7 support forefront flag in alert config 2017-09-13 12:32:30 +02:00
yflory 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 18:40:20 +02:00
yflory 437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
ansuz ad591fba50 bump version 2017-09-12 14:04:30 +02:00
yflory 8c3e2dbe61 Missing french translation keys 2017-09-12 11:45:47 +02:00
ansuz 306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +02:00
yflory 37dca9c155 Add missing translation keys in french 2017-09-11 14:12:06 +02:00
ansuz 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 2017-09-11 14:01:05 +02:00
ansuz 59d25b4c1a use camel case, not snek case 2017-09-11 14:00:27 +02:00
yflory 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar 2017-09-11 12:04:22 +02:00
yflory 7582c9cffd Fix register button in the index dropdown menu for mobiles 2017-09-11 11:22:41 +02:00
yflory c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00
yflory fc069dac48 Ask the user before loading the template picker 2017-09-08 16:21:12 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
ansuz 809b56625d refactor ui elements 2017-09-07 18:54:58 +02:00
ansuz bca9ba66cb enforce a configurable minimum password length when registering 2017-09-07 17:44:04 +02:00
ansuz ef30b0bc42 contribute to z-index arms race 2017-09-07 16:50:06 +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 263c2eb2c2 fix overflowing title text 2017-09-07 14:17:43 +02:00
ansuz cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-07 12:45:18 +02:00
ansuz 15e24ebe4f ui for hashtag picker 2017-09-07 12:45:07 +02:00
yflory fe8b2c2556 Fix french translation 2017-09-06 15:43:30 +02:00
yflory 8f2776657b Add translations for pad embed 2017-09-06 11:21:53 +02:00
yflory 3ca9f41290 Get embed code for pad and code 2017-09-06 10:56:27 +02:00
yflory d22edc03b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:34:49 +02:00
yflory 53eb9bb541 Remove the logo from the filepicker loading screen 2017-09-05 15:34:38 +02:00
ansuz 5c9ce0caa5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:32:31 +02:00
ansuz 77bbb3add4 bump footer and package.json version string 2017-09-05 15:29:28 +02:00
yflory 01881ac469 Update loading tips in the french translation 2017-09-05 15:15:57 +02:00
yflory 729c013af7 Get mediatag embed code from the file app 2017-09-05 15:08:05 +02:00
ansuz 5eb13461c0 remove anchor button 2017-09-05 12:16:49 +02:00
yflory 204e45dfae Enable templates in pad 2017-09-05 11:57:44 +02:00
yflory 78b338c379 Merge branch 'code2' into staging 2017-09-05 11:38:17 +02:00
yflory d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
yflory 86e23ac19f Use less2 in secure iframes 2017-09-04 15:09:54 +02:00
ansuz 7b27b8635d fix padding on registration button 2017-08-31 18:58:08 +02:00
ansuz 6bb29e52e2 lint compliance 2017-08-31 18:45:18 +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 1bf77cb77e changed the icons 2017-08-31 11:27:02 +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
yflory 0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory d3e947f17e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:11:48 +02:00
yflory 7498057c89 Fix Safari iframe size 2017-08-30 11:11:43 +02:00
yflory a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
ansuz a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz 2ef4ebc6ef two new tips for the loading screen 2017-08-29 17:56:34 +02:00
ansuz 570ff75a6c update footer for latest version 2017-08-29 11:12:08 +02:00
yflory d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 12:22:38 +02:00
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 2017-08-28 12:22:31 +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
ansuz f9cdbe66a0 add forgotten translation string 2017-08-24 17:20:59 +02:00
Caleb James DeLisle 35e7341f4d Merge branch 'ui-integration' into staging2 2017-08-24 13:54:55 +02:00
Caleb James DeLisle 7bbea28831 minor anti-xss changes... 2017-08-24 13:53:42 +02:00
Caleb James DeLisle 2ad9fcee17 Manual merge of notify.js 2017-08-23 10:45:55 +02:00
yflory 33025a9df9 Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2 2017-08-22 18:19:06 +02:00
ansuz 89a13d4b21 work on contacts2 until feature parity is reached 2017-08-22 15:55:49 +02:00
Caleb James DeLisle d9f5e3638e Big caching improvements :D 2017-08-22 15:50:10 +02:00
yflory 1752124071 Fix Iframe height in Edge 2017-08-22 11:50:52 +02:00
Caleb James DeLisle b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
CatalinScr 49f7e0d63b Changed the Social Media links to Pierre 2017-08-18 16:01:50 +03:00
ansuz 48fe3ef841 add a tip about cryptdrive 2017-08-17 14:25:24 +02:00
ansuz 839c6df3bb remove invalid loading screen tips. create a new one 2017-08-17 14:16:37 +02:00
yflory 0a813b4fab Fix limit bar overflowing when over the limit 2017-08-17 10:24:10 +02: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 f7b2aa85b8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:36:25 +02:00
Caleb James DeLisle 3df20760c4 Yann does not have a twitter account. 2017-08-16 11:36:14 +02:00
yflory df8851a53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:35:56 +02:00
yflory df0b7155f6 Add missing french translation 2017-08-16 11:35:40 +02:00
ansuz 127b6dbc6b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:34:35 +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
yflory a39f802b4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:17:37 +02:00
yflory e4d842ed08 Fix typos in the french translation 2017-08-16 10:55:15 +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 3196d4558f repaired the responsive error at about page 2017-08-15 06:50:13 +03:00
CatalinScr 3960cd25f8 Updated the about page with the new design 2017-08-14 16:40:09 +03:00
Caleb James DeLisle 7c8df61f91 sed majik to switch 'What is CryptDrive' to 'What is CryptPad' 2017-08-11 17:54:15 +02:00
Caleb James DeLisle 196ce3b3f7 Fix alertify style which made the registration popup look bad 2017-08-11 17:49:19 +02:00
Pierre Bondoerffer f580d9a30a
*actually* fix alertify on mobile 2017-08-11 15:16:51 +02:00
Pierre Bondoerffer 8c0fe7d277
Add missing UI element translations 2017-08-11 15:10:45 +02:00
Pierre Bondoerffer 144f9f4c83
alertify fix on mobile 2017-08-11 14:46:08 +02:00
Caleb James DeLisle 9833bd7e59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-11 14:31:40 +02:00
Caleb James DeLisle 89a8e8050c Fix typo and also change message to explain itself better 2017-08-11 14:31:31 +02:00
ansuz 64849507b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-11 14:26:34 +02:00
ansuz 328107be4d translation key for using tabs 2017-08-11 14:26:08 +02:00
Pierre Bondoerffer b00d37d9e7
proper namespace for font 2017-08-11 14:14:58 +02:00
Pierre Bondoerffer 0f74dffc48
fix register button being cut off 2017-08-11 14:11:50 +02:00
Pierre Bondoerffer 92d3b1a9fc
actually pull in open-sans, move fonts to own include 2017-08-11 14:10:54 +02:00
ansuz 958294f109 put code settings in their own tab 2017-08-11 13:00:50 +02:00
ansuz ae0b2ca1a8 add label for code indentation 2017-08-11 12:55:10 +02: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