Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 9571b3c018 persist whiteboard content across sessions 2017-09-26 15:16:17 +02:00
ansuz 748172585e update for modified id 2017-09-26 15:00:25 +02:00
ansuz 4cd7d8eda4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-26 14:35:02 +02:00
ansuz 52be5501d6 remove invalid test 2017-09-26 14:34:54 +02:00
ansuz b3e066eaca show loading screen tips during loading screen 2017-09-26 10:59:25 +02:00
ansuz 95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
ansuz 68f7d4bc0a more conformant tagPrompt behaviour 2017-09-20 17:55:05 +02:00
ansuz db4c3e7e2c Merge branch 'master' into staging 2017-09-20 12:07:01 +02:00
ansuz b5b84f540e fix preview mode class 2017-09-20 12:02:46 +02:00
ansuz 53b98c12c9 ignore broken stylesheet 2017-09-20 11:33:30 +02:00
ansuz f990200996 drop any notion of crypto from sframe-listmap 2017-09-19 18:21:33 +02:00
ansuz a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:38:21 +02:00
ansuz c9223cb942 listmap does not care about 'readOnly' mode anymore 2017-09-19 15:38:06 +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
ansuz 4af01e6e9e make listmap consume cpNfInner 2017-09-19 14:16:13 +02:00
ansuz 029a8e3023 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 10:27:30 +02:00
ansuz d72146ba7f use setAttribute for assigning attributes in hyperscript 2017-09-19 10:27:19 +02:00
ansuz 937d323780 don't assume anything ckeditor-related is lint compliant 2017-09-18 15:31:02 +02:00
ansuz 5c405090e1 pin ckeditor version 2017-09-18 15:09:39 +02:00
ansuz 927a4b948f Merge branch 'soon' into staging 2017-09-14 14:05:55 +02:00
ansuz 15db6b180c copy bug fixes from changes 2017-09-14 13:43:13 +02:00
ansuz 5b45e92250 delete range requests after they have completed 2017-09-14 12:08:41 +02:00
ansuz 4f6909fce3 set icon to 'faded' styles 2017-09-14 12:07:21 +02:00
ansuz 086d4bae32 clean up contacts initialization 2017-09-14 12:01:57 +02:00
ansuz 47ce645897 implement slice 2017-09-14 11:51:33 +02:00
ansuz a8f7beb20b remove deprecated apps 2017-09-14 11:36:40 +02:00
ansuz 6ed4f2fc64 fix a thing 2017-09-14 11:27:10 +02:00
ansuz 8a564bf350 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:23:51 +02:00
ansuz 513f8e73d4 refactor cryptpad.ready to use nthen 2017-09-14 11:23:37 +02:00
ansuz 4d688289cc lint-compliance 2017-09-13 18:19:15 +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
ansuz fbd4be6135 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:32:41 +02:00
ansuz a332168926 fix some bugs in prompts, alerts, confirms 2017-09-13 15:52:31 +02:00
ansuz 0db33d48fc properly handle variable args in Cryptpad.alert 2017-09-13 14:52:58 +02:00
ansuz 8a87ec180e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 14:52:26 +02:00
ansuz dc86579d46 use an 8 character password for tests 2017-09-13 14:00:48 +02:00
ansuz e1f090bb9d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 12:33:05 +02:00
ansuz 244e3ecba7 support forefront flag in alert config 2017-09-13 12:32:30 +02:00
ansuz cce8811f9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 14:17:46 +02:00
ansuz ad591fba50 bump version 2017-09-12 14:04:30 +02:00
ansuz 9d229b8868 lint compliance 2017-09-12 11:30:43 +02:00
ansuz a87ccdc37e remove redundant lines 2017-09-12 11:27:24 +02:00
ansuz 4dedb5e2a6 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-09-12 11:25:32 +02:00
ansuz da0e31fa54 guard against possible type errors 2017-09-12 11:20:50 +02:00
ansuz 499b5ea2ba warn that a password is too short before doing anything else 2017-09-12 10:50:59 +02:00
ansuz a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts 2017-09-12 10:49:48 +02:00
ansuz 58c38dd77b focus on the current window when you pop an alert 2017-09-11 16:34:00 +02:00
ansuz b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:26:21 +02:00
ansuz 306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +02:00
ansuz 1943c83f69 clean up api for Cryptpad.confirm 2017-09-11 16:24:43 +02:00
ansuz 5a1abc8986 let's try using actual js syntax 2017-09-11 14:04:40 +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
ansuz 520b8967fd allow people with short passwords to log in 2017-09-11 13:54:48 +02:00
ansuz 0ed6846e07 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-08 17:41:46 +02:00
ansuz b5b9f931c7 don't use common-realtime 2017-09-08 17:41:05 +02:00
ansuz 32e8c8ef4b implement alertify without alertify 2017-09-08 17:40:25 +02:00
ansuz a302ee5d25 guard against undefined arguments 2017-09-08 17:39:41 +02:00
ansuz de5d925154 autoselect user href in settings 2017-09-08 15:07:25 +02:00
ansuz e950ce74cb focus on input when opening filepicker 2017-09-08 15:01:47 +02:00
ansuz 739903d511 don't check account usage if you aren't logged in 2017-09-08 14:00:49 +02:00
ansuz bbf7ed3827 refactor drive to use dialog.selectable()
fix class on alertify-like boxes
2017-09-08 12:24:20 +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 1958bca984 restore hashing screen in login and register 2017-09-07 16:48:22 +02:00
ansuz fab6264ce6 use loading screen from pages.js 2017-09-07 16:41:11 +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 e8298f165a only display first letter of name if user has no avatar 2017-09-07 16:35:24 +02:00
ansuz 85003f7a23 lint compliance 2017-09-07 14:21:54 +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
ansuz 1b97996ef8 implement util.once 2017-09-07 12:26:05 +02:00
ansuz 47ec959032 make sure contenteditable is not set in read only mode 2017-09-05 18:35:11 +02:00
ansuz 6a735b441f use paul's print styles 2017-09-05 18:16:06 +02:00
ansuz b3d5e04bb4 lint compliance 2017-09-05 17:23:16 +02:00
ansuz 3d2a2da74e add listAllTags api 2017-09-05 16:52:22 +02:00
ansuz 0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:37:02 +02:00
ansuz 1c50bb3f61 clear hung tooltips 2017-09-05 15:36:46 +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
ansuz c790442736 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 12:18:16 +02:00
ansuz 5eb13461c0 remove anchor button 2017-09-05 12:16:49 +02:00
ansuz 38e1ed93e4 Merge branch 'code2' into staging 2017-09-05 11:42:00 +02:00
ansuz acaf45a0e0 drop thumbnails if metadata is too large 2017-09-05 11:38:49 +02:00
ansuz 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:27:11 +02:00
ansuz d42d988d36 make test more resilient 2017-09-05 11:26:41 +02:00
ansuz cd7b00d45b make pixels 100px 2017-09-05 11:25:47 +02:00
ansuz e8ac5ed87f add a test for thumbnails 2017-09-05 11:24:30 +02:00
ansuz b1a1f4ba13 add encrypted thumbnails to metadata for images.
correct decryption logic
2017-09-05 10:57:59 +02:00
ansuz b8e913c95a more thumbnail methods 2017-09-05 10:46:00 +02:00
ansuz ffbb21dd2c use cryptpad-september build of media-tag 2017-09-05 10:43:48 +02:00
ansuzandCaleb James DeLisle a10bab893f jshintignore media-tag 2017-09-01 10:18:42 +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