Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-11 16:26:21 +02:00
• 306fec2d0e improve messages for template picker confirm ansuz 2017-09-11 16:25:58 +02:00
• 1943c83f69 clean up api for Cryptpad.confirm ansuz 2017-09-11 16:24:43 +02:00
• 8d3ebdbaf7 I'm stupid Caleb James DeLisle 2017-09-11 15:53:27 +02:00
• 041071e61c manual merge Caleb James DeLisle 2017-09-11 15:52:14 +02:00
• 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) Caleb James DeLisle 2017-09-11 15:46:21 +02:00
• 9271b0c1a8 Try to fix half-codemirror bug yflory 2017-09-11 14:42:43 +02:00
• 304a8df808 Remove unneeded migration and fix attributes migration yflory 2017-09-11 14:25:19 +02:00
• 37dca9c155 Add missing translation keys in french yflory 2017-09-11 14:12:06 +02:00
• 5a1abc8986 let's try using actual js syntax ansuz 2017-09-11 14:04:40 +02:00
• 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 ansuz 2017-09-11 14:01:05 +02:00
• 59d25b4c1a use camel case, not snek case ansuz 2017-09-11 14:00:27 +02:00
• 520b8967fd allow people with short passwords to log in ansuz 2017-09-11 13:54:48 +02:00
• 8ef27dca08 Lint yflory 2017-09-11 12:25:23 +02:00
• 1aef844fc3 Fix title attribute for truncated titles in the drive yflory 2017-09-11 12:23:24 +02:00
• 55fe882f64 Fix readonly mode in code yflory 2017-09-11 12:23:04 +02:00
• 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar yflory 2017-09-11 12:04:22 +02:00
• bd422178c4 Hide the filepicker button in readonly mode yflory 2017-09-11 11:59:09 +02:00
• 51f1be9f7a Improve the input style when renaming a folder in the drive tree yflory 2017-09-11 11:50:04 +02:00
• 642511dc3b Disable exiting present mode when in embed mode yflory 2017-09-11 11:38:40 +02:00
• 7582c9cffd Fix register button in the index dropdown menu for mobiles yflory 2017-09-11 11:22:41 +02:00
• 403b62f131 Fix ghost icon modal and improve UI on mobile yflory 2017-09-11 11:04:14 +02:00
• 60cbfb4281 Auto-resolve bower dependencies conflict yflory 2017-09-11 10:41:44 +02:00
• 757d0a2800 Save the state of CKEditor's toolbar (visible or hidden) yflory 2017-09-11 10:10:29 +02:00
• 5bf966633c Merge branch 'staging' into slide2 yflory 2017-09-08 18:21:38 +02:00
• 514bff7065 Add slide number in the title in slide2 yflory 2017-09-08 18:21:11 +02:00
• 0ed6846e07 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-08 17:41:46 +02:00
• b5b9f931c7 don't use common-realtime ansuz 2017-09-08 17:41:05 +02:00
• 32e8c8ef4b implement alertify without alertify ansuz 2017-09-08 17:40:25 +02:00
• a302ee5d25 guard against undefined arguments ansuz 2017-09-08 17:39:41 +02:00
• c3a07e879c Merge branch 'staging' into slide2 yflory 2017-09-08 16:23:07 +02:00
• fc069dac48 Ask the user before loading the template picker yflory 2017-09-08 16:21:12 +02:00
• 05793c220c Fix secure iframes on Edge yflory 2017-09-08 15:54:54 +02:00
• 290d668ceb Fix race condition preventing slide to work on Edge yflory 2017-09-08 15:53:53 +02:00
• de5d925154 autoselect user href in settings ansuz 2017-09-08 15:07:25 +02:00
• e950ce74cb focus on input when opening filepicker ansuz 2017-09-08 15:01:47 +02:00
• 739903d511 don't check account usage if you aren't logged in ansuz 2017-09-08 14:00:49 +02:00
• bbf7ed3827 refactor drive to use dialog.selectable() ansuz 2017-09-08 12:24:20 +02:00
• 684a12ce2e Update pinneddata to work on blobs too Caleb James DeLisle 2017-09-08 11:35:45 +02:00
• fe2454ba31 add the ability to filter for old pads using pinneddata.js Caleb James DeLisle 2017-09-08 10:39:45 +02:00
• 1ae7076790 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad Paul Libbrecht 2017-09-07 22:08:34 +02:00
• f2aaaa9751 Move slide to secure iframe yflory 2017-09-07 18:56:58 +02:00
• 809b56625d refactor ui elements ansuz 2017-09-07 18:54:58 +02:00
• bca9ba66cb enforce a configurable minimum password length when registering ansuz 2017-09-07 17:43:58 +02:00
• ef30b0bc42 contribute to z-index arms race ansuz 2017-09-07 16:50:06 +02:00
• 1958bca984 restore hashing screen in login and register ansuz 2017-09-07 16:48:17 +02:00
• fab6264ce6 use loading screen from pages.js ansuz 2017-09-07 16:41:11 +02:00
• a6eb1444df add loading screen markup to register and login ansuz 2017-09-07 16:39:42 +02:00
• 352d504944 avoid loading unnecessary files ansuz 2017-09-07 16:39:20 +02:00
• e8298f165a only display first letter of name if user has no avatar ansuz 2017-09-07 16:35:24 +02:00
• 85003f7a23 lint compliance ansuz 2017-09-07 14:21:54 +02:00
• 263c2eb2c2 fix overflowing title text ansuz 2017-09-07 14:17:43 +02:00
• cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-07 12:45:18 +02:00
• 15e24ebe4f ui for hashtag picker ansuz 2017-09-07 12:45:07 +02:00
• 1b97996ef8 implement util.once ansuz 2017-09-07 12:26:05 +02:00
• 0423a5f4e2 Clean secure iframe code yflory 2017-09-06 18:26:10 +02:00
• 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings yflory 2017-09-06 16:05:20 +02:00
• fe8b2c2556 Fix french translation yflory 2017-09-06 15:43:30 +02:00
• 61b228db79 Fix double / when storing a file yflory 2017-09-06 11:41:09 +02:00
• 8b2733e2da Fix typo yflory 2017-09-06 11:37:19 +02:00
• 1be12a7f15 Merge branch 'soon' into staging yflory 2017-09-06 11:21:59 +02:00
• 8f2776657b Add translations for pad embed yflory 2017-09-06 11:21:53 +02:00
• c713b44a4a Merge branch 'soon' yflory 2017-09-06 11:13:10 +02:00
• d98bbf7df9 Fix the pad app when cryptpad is in an iframe yflory 2017-09-06 11:03:20 +02:00
• 3ca9f41290 Get embed code for pad and code yflory 2017-09-06 10:56:27 +02:00
• 0bb6698399 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 18:40:18 +02:00
• e85b34f127 Add embed options in the secure pad hashes yflory 2017-09-05 18:38:51 +02:00
• 47ec959032 make sure contenteditable is not set in read only mode ansuz 2017-09-05 18:35:11 +02:00
• 6a735b441f use paul's print styles ansuz 2017-09-05 18:16:06 +02:00
• e7de9229a8 Do not print toolbar and collaboration (#178). paul Paul Libbrecht 2017-09-05 17:29:03 +02:00
• b3d5e04bb4 lint compliance ansuz 2017-09-05 17:23:16 +02:00
• 3d2a2da74e add listAllTags api ansuz 2017-09-05 16:52:22 +02:00
• 31a6881dba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 15:40:02 +02:00
• 305feebbbe Fix scroll position when refreshing the drive tree yflory 2017-09-05 15:39:49 +02:00
• 0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-05 15:37:02 +02:00
• 1c50bb3f61 clear hung tooltips ansuz 2017-09-05 15:36:46 +02:00
• d22edc03b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 15:34:49 +02:00
• 53eb9bb541 Remove the logo from the filepicker loading screen yflory 2017-09-05 15:34:38 +02:00
• 5c9ce0caa5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-05 15:32:31 +02:00
• 77bbb3add4 bump footer and package.json version string ansuz 2017-09-05 15:29:28 +02:00
• 01881ac469 Update loading tips in the french translation yflory 2017-09-05 15:15:57 +02:00
• 729c013af7 Get mediatag embed code from the file app yflory 2017-09-05 15:08:05 +02:00
• c790442736 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-05 12:18:16 +02:00
• 5eb13461c0 remove anchor button ansuz 2017-09-05 12:16:49 +02:00
• 904936209a Remove loading tips in the file picker yflory 2017-09-05 11:59:42 +02:00
• 98cd69e53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-05 11:57:54 +02:00
• 204e45dfae Enable templates in pad yflory 2017-09-05 11:57:44 +02:00
• 38e1ed93e4 Merge branch 'code2' into staging ansuz 2017-09-05 11:42:00 +02:00
• 4108520d20 Add contacts in the new menu if the user is logged in yflory 2017-09-05 11:43:16 +02:00
• acaf45a0e0 drop thumbnails if metadata is too large ansuz 2017-09-05 11:38:49 +02:00
• 78b338c379 Merge branch 'code2' into staging yflory 2017-09-05 11:38:17 +02:00
• db86a2dbee Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 yflory 2017-09-05 11:36:31 +02:00
• d2787e3eff Make code2 the default code app yflory 2017-09-05 11:35:15 +02:00
• 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 ansuz 2017-09-05 11:27:11 +02:00
• d42d988d36 make test more resilient ansuz 2017-09-05 11:26:41 +02:00
• cd7b00d45b make pixels 100px ansuz 2017-09-05 11:25:35 +02:00
• e8ac5ed87f add a test for thumbnails ansuz 2017-09-05 11:24:30 +02:00
• b1a1f4ba13 add encrypted thumbnails to metadata for images. ansuz 2017-09-05 10:49:26 +02:00
• b8e913c95a more thumbnail methods ansuz 2017-09-05 10:46:00 +02:00
• ffbb21dd2c use cryptpad-september build of media-tag ansuz 2017-09-05 10:43:48 +02:00