19e58cec94
prevent typeError
2017-09-28 10:23:48 +02:00
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
2017-09-27 16:53:16 +02:00
6dbc02e81a
Merge branch 'staging' into framework
2017-09-27 12:01:18 +02:00
1c791b5b51
Fix framework by removing some async and also fix media tags
2017-09-27 11:58:14 +02:00
90d00c10b1
Make metadata-manager a bit more robust
2017-09-27 11:56:25 +02:00
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
342b6012f7
manual merge of staging into framework
2017-09-26 17:11:45 +02:00
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 15:58:33 +02:00
e62c5e1d07
Add some debugging lines to help synthesize error cases
2017-09-26 15:58:25 +02:00
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
b3e066eaca
show loading screen tips during loading screen
2017-09-26 10:59:25 +02:00
77fe6a9bba
small bug fixes
2017-09-26 10:23:35 +02:00
1b01855dd2
Merge branch 'staging' into framework
2017-09-25 18:11:57 +02:00
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
2017-09-25 18:03:31 +02:00
368a6b2406
manual merge, still wip
2017-09-25 17:35:25 +02:00
cdeac00633
Merge branch 'staging' into newdrive
2017-09-25 17:35:06 +02:00
a8eecee590
Fix access to undefined variable in drive
2017-09-25 17:29:31 +02:00
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-25 17:09:41 +02:00
138ad17e3e
Fix 'import local pads' in settings creating duplicates
2017-09-25 17:09:26 +02:00
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
2017-09-25 16:09:54 +02:00
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:46:04 +02:00
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:45:56 +02:00
b15527565c
Allow passing arguments when firing events
2017-09-25 15:45:49 +02:00
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
2017-09-25 15:45:08 +02:00
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:44:03 +02:00
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:43:02 +02:00
72f03b2a47
Allow passing arguments when firing events
2017-09-25 15:42:08 +02:00
6aeb366767
Lint
2017-09-25 14:47:19 +02:00
0600ce59ec
Display the 'spinner' when typing in sframe apps
2017-09-25 13:19:25 +02:00
1d7683503f
Fix link origin in sframe upload table
2017-09-25 12:44:05 +02:00
92c808812a
Fix missing style in toolbar/less2
2017-09-25 11:59:05 +02:00
4049931924
Lint
2017-09-25 11:51:24 +02:00
c364377d7c
Use less2 in sframe drive
2017-09-25 11:48:42 +02:00
47fe7b1c53
Drive in sandboxed iframe
2017-09-22 19:35:06 +02:00
dfdeb7b113
Fix style and race condition for history mode
2017-09-21 18:00:33 +02:00
a810d7bd85
Fix style and race condition for history mode
2017-09-21 18:00:11 +02:00
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
95302366d1
lint compliance
2017-09-21 11:19:23 +02:00
68f7d4bc0a
more conformant tagPrompt behaviour
2017-09-20 17:55:05 +02:00
f990200996
drop any notion of crypto from sframe-listmap
2017-09-19 18:21:33 +02:00
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:38:21 +02:00
c9223cb942
listmap does not care about 'readOnly' mode anymore
2017-09-19 15:38:06 +02:00
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:36:38 +02:00
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
d2b27f3588
resolve merge conflicts
2017-09-19 14:24:26 +02:00
4af01e6e9e
make listmap consume cpNfInner
2017-09-19 14:16:13 +02:00
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
6ed4f2fc64
fix a thing
2017-09-14 11:27:10 +02:00
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:23:51 +02:00
513f8e73d4
refactor cryptpad.ready to use nthen
2017-09-14 11:23:37 +02:00
b643ccc232
typo
2017-09-14 10:54:16 +02:00
652c916690
change the command in the documentation so that it will not change itself
2017-09-14 10:52:55 +02:00
845f75f8a7
remove a 100ms dead spot from page load
2017-09-14 10:48:59 +02:00
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
8a32b72ffc
1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
...
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
2017-09-14 10:23:05 +02:00
4d688289cc
lint-compliance
2017-09-13 18:19:15 +02:00
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 18:18:45 +02:00
47cfa0cf45
Focus the editable content when opening a codemirror pad
2017-09-13 18:09:55 +02:00
f039fc7ff5
develop a system for avoiding z-index problems
2017-09-13 17:43:17 +02:00
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 17:22:48 +02:00
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:32:41 +02:00
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:20:26 +02:00
ab64bf9e59
Use less2 for the loading screen
2017-09-13 16:19:26 +02:00
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
2017-09-13 16:04:01 +02:00
a332168926
fix some bugs in prompts, alerts, confirms
2017-09-13 15:52:31 +02:00
0db33d48fc
properly handle variable args in Cryptpad.alert
2017-09-13 14:52:58 +02:00
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +02:00
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
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
2017-09-13 14:46:41 +02:00
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 12:33:05 +02:00
244e3ecba7
support forefront flag in alert config
2017-09-13 12:32:30 +02:00
63cb5dfc1e
Make less loader rewrite urls to use version parameter
2017-09-13 12:04:24 +02:00
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 11:00:09 +02:00
e3c0ec29f7
Hopefully chase out a race in sframe-channel
2017-09-13 11:00:00 +02:00
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 18:40:20 +02:00
437f50fd4a
Migrate the file to a sandboxed iframe
2017-09-12 18:40:11 +02:00
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:12:41 +02:00
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
2017-09-12 14:12:35 +02:00
7d720c73a9
Merge branch 'soon'
2017-09-12 11:34:12 +02:00
ddbda08c88
Fix an issue when cleaning the template category in the drive
2017-09-12 11:32:32 +02:00
9d229b8868
lint compliance
2017-09-12 11:30:43 +02:00
a87ccdc37e
remove redundant lines
2017-09-12 11:27:24 +02:00
da0e31fa54
guard against possible type errors
2017-09-12 11:20:50 +02:00
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:36:41 +02:00
79094aa4bb
Fix closing the title input when the title is not modified
2017-09-11 16:36:24 +02:00
58c38dd77b
focus on the current window when you pop an alert
2017-09-11 16:34:00 +02:00
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:26:21 +02:00
306fec2d0e
improve messages for template picker confirm
2017-09-11 16:25:58 +02:00
1943c83f69
clean up api for Cryptpad.confirm
2017-09-11 16:24:43 +02:00
8d3ebdbaf7
I'm stupid
2017-09-11 15:53:27 +02:00
041071e61c
manual merge
2017-09-11 15:52:14 +02:00
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
2017-09-11 15:46:21 +02:00
304a8df808
Remove unneeded migration and fix attributes migration
2017-09-11 14:25:19 +02:00
5a1abc8986
let's try using actual js syntax
2017-09-11 14:04:40 +02:00
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
2017-09-11 14:01:05 +02:00
59d25b4c1a
use camel case, not snek case
2017-09-11 14:00:27 +02:00
520b8967fd
allow people with short passwords to log in
2017-09-11 13:54:48 +02:00
5bf966633c
Merge branch 'staging' into slide2
2017-09-08 18:21:38 +02:00
514bff7065
Add slide number in the title in slide2
2017-09-08 18:21:11 +02:00
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-08 17:41:46 +02:00
b5b9f931c7
don't use common-realtime
2017-09-08 17:41:05 +02:00
32e8c8ef4b
implement alertify without alertify
2017-09-08 17:40:25 +02:00
c3a07e879c
Merge branch 'staging' into slide2
2017-09-08 16:23:07 +02:00
fc069dac48
Ask the user before loading the template picker
2017-09-08 16:21:12 +02:00
05793c220c
Fix secure iframes on Edge
2017-09-08 15:55:01 +02:00
290d668ceb
Fix race condition preventing slide to work on Edge
2017-09-08 15:53:53 +02:00
739903d511
don't check account usage if you aren't logged in
2017-09-08 14:00:49 +02:00
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
2017-09-08 12:24:20 +02:00
f2aaaa9751
Move slide to secure iframe
2017-09-07 18:56:58 +02:00
809b56625d
refactor ui elements
2017-09-07 18:54:58 +02:00
bca9ba66cb
enforce a configurable minimum password length when registering
2017-09-07 17:44:04 +02:00
fab6264ce6
use loading screen from pages.js
2017-09-07 16:41:11 +02:00
e8298f165a
only display first letter of name if user has no avatar
2017-09-07 16:35:24 +02:00
85003f7a23
lint compliance
2017-09-07 14:21:54 +02:00
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-07 12:45:18 +02:00
15e24ebe4f
ui for hashtag picker
2017-09-07 12:45:07 +02:00
1b97996ef8
implement util.once
2017-09-07 12:26:05 +02:00
0423a5f4e2
Clean secure iframe code
2017-09-06 18:26:10 +02:00
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
2017-09-06 16:05:20 +02:00
61b228db79
Fix double / when storing a file
2017-09-06 11:41:09 +02:00
3ca9f41290
Get embed code for pad and code
2017-09-06 10:56:27 +02:00
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 18:40:18 +02:00
e85b34f127
Add embed options in the secure pad hashes
2017-09-05 18:38:51 +02:00
b3d5e04bb4
lint compliance
2017-09-05 17:23:16 +02:00
3d2a2da74e
add listAllTags api
2017-09-05 16:52:22 +02:00
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 15:37:02 +02:00
1c50bb3f61
clear hung tooltips
2017-09-05 15:36:46 +02:00
53eb9bb541
Remove the logo from the filepicker loading screen
2017-09-05 15:34:38 +02:00
729c013af7
Get mediatag embed code from the file app
2017-09-05 15:08:05 +02:00
4108520d20
Add contacts in the new menu if the user is logged in
2017-09-05 11:43:16 +02:00
78b338c379
Merge branch 'code2' into staging
2017-09-05 11:38:17 +02:00
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
2017-09-05 11:36:31 +02:00
d2787e3eff
Make code2 the default code app
2017-09-05 11:36:02 +02:00
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
2017-09-05 11:27:11 +02:00
cd7b00d45b
make pixels 100px
2017-09-05 11:25:47 +02:00
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
2017-09-05 10:57:59 +02:00
b8e913c95a
more thumbnail methods
2017-09-05 10:46:00 +02:00
ffbb21dd2c
use cryptpad-september build of media-tag
2017-09-05 10:43:48 +02:00
86e23ac19f
Use less2 in secure iframes
2017-09-04 15:09:54 +02:00
f12f4bb925
Integrate filepicker secure iframe in the code2 app
2017-09-01 15:17:14 +02:00
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-31 18:12:21 +02:00
ae60b5845f
implement search-by-tag for filesData
2017-08-31 18:12:13 +02:00
72ef730f23
implement tag-related functions
2017-08-31 18:06:26 +02:00
0302c06d0e
send feedback if client does not support symbols
2017-08-31 18:04:20 +02:00
52019dc763
make get and set pad attribute return only cloned data
2017-08-31 18:02:44 +02:00
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
2017-08-31 16:32:26 +02:00
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
2017-08-31 16:28:48 +02:00
885282ddea
Fix undefined friend
2017-08-31 15:49:20 +02:00
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
2017-08-30 19:23:01 +02:00
b8971cdc23
Add previewMode settings to code2
2017-08-30 18:47:50 +02:00
0d008aaa2e
Add indent settings to code2
2017-08-30 17:57:10 +02:00
f54dc7505c
Migrate indentation settings to a settings subobject
2017-08-30 17:19:50 +02:00
0893bcc0e5
Merge branch 'staging' into code2
2017-08-30 14:57:19 +02:00
f06683e949
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-30 12:26:23 +02:00
0ce32464fd
Fix flickering avatar in firefox
2017-08-30 12:26:11 +02:00
ba0e935add
stub localStorage, and handle errors that might come from touching localStorage
2017-08-30 11:31:49 +02:00
be8ea4102e
keep trying to parse the hash until it works
2017-08-30 11:26:51 +02:00
a2ed266048
Move the code app in a secure iframe
2017-08-30 11:10:57 +02:00
a34d1793e0
drop 'loading' text from loading screen
2017-08-29 18:15:40 +02:00
181a19a9a0
polyfill for array.fill
2017-08-29 11:49:10 +02:00
51fa6287c1
Enable notifications in secure pads
2017-08-29 11:20:02 +02:00
642dc17910
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-29 11:03:05 +02:00
901917983b
Fix an issue preventing pads to be stored in the drive
2017-08-29 11:02:56 +02:00
8fb7fef3f5
regular expressions are never falsey
2017-08-29 10:37:19 +02:00
24eac9b4a6
test for flakey tests
2017-08-28 18:42:04 +02:00
7d2a76f4d6
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
2017-08-28 18:32:43 +02:00
430a6f7b77
lint compliance
2017-08-28 17:51:50 +02:00
d9a4a32bf9
Fix avatar for anonymous users in secure pads
2017-08-28 16:57:10 +02:00
00fda0d7d7
Fix avatar in read-only mode (secure pads)
2017-08-28 16:49:28 +02:00
88cb4fd83c
Enable friend requests from secure pads
2017-08-28 16:21:05 +02:00
147d88d845
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 15:13:30 +02:00
e43c68aa48
Fix viewers number in secure iframe
2017-08-28 15:13:16 +02:00
f89015d9ed
Update the tab title to match the pad title in pad2
2017-08-28 14:49:33 +02:00
1280cd1659
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 14:49:01 +02:00
51c065d13c
Fix link to main in the new toolbar
2017-08-28 14:18:33 +02:00
d9bf2abcd8
Fix old hashes not working anymore in pad
2017-08-28 13:53:24 +02:00
536fe04790
emit notification when alert, confirm, or prompt are called
2017-08-28 13:46:28 +02:00
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 12:22:38 +02:00
6c65e5ff72
Fix the ghost icon in the drive and add missing text
2017-08-28 12:22:31 +02:00
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
2017-08-28 11:47:01 +02:00
841e3af8da
handle unfriends. clean up. better input validation
2017-08-28 11:46:05 +02:00
c66a0c55e0
ensure that function signatures are correct
2017-08-28 11:40:31 +02:00
91f6e3e543
remove a lot of dead code
2017-08-28 11:28:45 +02:00
57d0c6c973
Merge branch 'new-messaging' into staging
2017-08-25 14:42:34 +02:00
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-25 14:42:23 +02:00
22d754d514
handle user renames
2017-08-25 14:42:05 +02:00
0a6f81850f
Handle infinite-spinner errors and properly inform the user
2017-08-25 14:24:43 +02:00
f58d4c941f
clean up a bit
2017-08-24 17:19:57 +02:00
b75a951a98
encode messages with 'author' field instead of 'channel'
2017-08-24 17:14:03 +02:00
7bbea28831
minor anti-xss changes...
2017-08-24 13:53:42 +02:00
013b75ae67
implement history range requests
2017-08-24 11:34:05 +02:00
b71f1860db
make uid function reusable
2017-08-24 11:31:20 +02:00
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
2017-08-23 16:18:47 +02:00
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-23 12:15:01 +02:00
cbac5e417c
Make loading screen come much earlier on pad2
2017-08-23 12:14:51 +02:00
b6881349be
Fix an issue with the notifications in secure pads
2017-08-23 11:39:53 +02:00
ec64ac485d
Fix 'not a function' error
2017-08-23 11:06:55 +02:00
acfaaa7d56
jshint compliance
2017-08-23 11:04:44 +02:00
2ad9fcee17
Manual merge of notify.js
2017-08-23 10:45:55 +02:00
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-23 10:21:53 +02:00
2dacd57e76
fix caching on favicon
2017-08-23 10:21:41 +02:00
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-22 18:19:06 +02:00
c33b128bf4
Enable feedback in pad2
2017-08-22 18:18:58 +02:00
e81bb3fe08
Fix profile link in the userlist
2017-08-22 18:18:48 +02:00
002eed0d6f
make most of the messenger api async
2017-08-22 15:55:00 +02:00
d9f5e3638e
Big caching improvements :D
2017-08-22 15:50:10 +02:00
b4864b96ac
Add a recent pads category in the drive
2017-08-22 14:28:17 +02:00
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:38:16 +02:00
4b70fc9f49
Use resources from the original origin in pad2
2017-08-21 18:38:07 +02:00
aa9e0d3cd3
Enable AppConfig in pad2
2017-08-21 18:30:51 +02:00
f40d2c0b20
Add templates to pad2
2017-08-21 18:21:53 +02:00
8d020833af
Add missing file
2017-08-21 18:21:25 +02:00
8d837d22ea
Add history to pad2
2017-08-21 17:40:21 +02:00
b2e6df1f9d
Add import & export in pad2
2017-08-21 15:34:21 +02:00
e2d39de143
Forget button in pad2
2017-08-21 15:20:38 +02:00
e4020ba8d4
Fix pad creation in pad2
2017-08-21 14:41:56 +02:00
140c6f3776
Add limit warning in pad2
2017-08-21 12:24:33 +02:00
30aef71603
Enable avatars in pad2
2017-08-21 12:01:38 +02:00
f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 11:08:38 +02:00
fb4808e1e1
Fix queries callback arguments
2017-08-21 11:08:27 +02:00
6dd1643738
Manual merge work done on loading page to pad2
2017-08-21 10:53:40 +02:00
8b702e0150
wip
2017-08-21 10:34:49 +02:00
e65b2f4e9f
Add shareButton to pad2
2017-08-18 18:43:04 +02:00
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-18 16:34:50 +02:00
90f892de9c
Useradmin menu, notifications and share button in pad2
2017-08-18 16:34:41 +02:00
253ab68d8d
Merge branch 'staging' into new-messaging
2017-08-18 15:31:06 +02:00
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
2017-08-18 14:12:30 +02:00
0693a98890
create a thumbnail when uploading images from whiteboard
2017-08-18 12:53:02 +02:00
b17044ad98
add support for thumbnails in metadata
2017-08-18 12:47:04 +02:00
dd9b38066e
Change display name in useradmin menu
2017-08-18 11:07:42 +02:00
a96d447e8b
Add notifications in pad2
2017-08-18 10:47:30 +02:00
cf6d8c83b2
Fix title setter logic and separate it from UI
2017-08-17 19:58:48 +02:00
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 19:01:40 +02:00
415399ef64
Changes to support title change in metadata
2017-08-17 19:01:33 +02:00
d1affebd14
Title in pad2
2017-08-17 19:01:03 +02:00
604415b32c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 18:29:24 +02:00
fab3d67b75
Enable title in pad2
2017-08-17 18:28:05 +02:00
909bda4302
This should fix laxy metadata
2017-08-17 18:26:58 +02:00
a4dbf39c4a
fix pdf display problems in chrome
2017-08-17 18:11:46 +02:00
2490ee253f
Added setDisplayName RPC
2017-08-17 18:09:17 +02:00
887a26b1a6
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 17:34:47 +02:00
0b34ceb0eb
Added RPC setPadTitleInDrive()
2017-08-17 17:34:08 +02:00
bed7d95bf3
use latest compiled cryptpad media-tag
2017-08-17 17:31:52 +02:00
3a5526e247
infer pdfjs document title from iframe url
2017-08-17 17:30:28 +02:00
25466aa2f9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 17:26:27 +02:00
1d237735ef
Useradmin menu in pad2
2017-08-17 17:26:20 +02:00
3b5af3ea74
sframe common changes
2017-08-17 16:56:18 +02:00
d1157c4d72
Add missing file
2017-08-17 16:28:54 +02:00
d237c76f6c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 16:25:31 +02:00
f5855a2870
Add account name in metadata manager
2017-08-17 16:25:25 +02:00
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
2017-08-17 16:17:57 +02:00
d88704fb50
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 15:44:41 +02:00
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 15:42:28 +02:00
fc5bdd3bed
Add lazy metadata to fix parse errors in pad2
2017-08-17 15:42:26 +02:00
ad9f2ff223
Made pad2 server more generic and easy to implement
2017-08-17 15:41:04 +02:00
a125253cde
lint compliance
2017-08-17 15:13:05 +02:00
290763d6c5
don't complain about bad realtime state just because you disconnected
2017-08-17 15:07:34 +02:00
226ef1fd00
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 14:55:53 +02:00
fb512c8923
Toolbar in pad2
2017-08-17 14:55:44 +02:00
3b20dcd435
add optional cache-busting to favicon
2017-08-17 14:34:22 +02:00
ee874878dd
clear tooltips when the userlist is redrawn
2017-08-17 12:50:40 +02:00
f207edfd28
handle errors when deriving keys. fix incorrect reference
2017-08-17 12:50:12 +02:00
e04c0b89a1
manual merge of staging
2017-08-17 12:14:19 +02:00
130b330ede
refactor messaging
2017-08-16 10:04:50 +02:00
736288a85b
lint compliance
2017-08-14 14:02:57 +02:00
5037f444e9
update markdown sanitization strategy
2017-08-14 13:12:43 +02:00
878a565f89
tiny little performance improvement in something that really doesn't need it
2017-08-11 17:34:51 +02:00
7a698d092e
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
2017-08-11 17:28:23 +02:00
17b986a6ca
fix toolbar drive link (oops)
2017-08-11 12:56:06 +02:00
284124a32d
WIP
2017-08-11 10:59:54 +02:00
4acd9957a9
Set the url if there is none
2017-08-11 10:40:57 +02:00
33e73dd5e5
fixed one last fight
2017-08-10 21:40:34 +02:00
9c0b0cc6a8
Merge branch 'staging' into pad2
2017-08-10 18:39:16 +02:00
1e56fa31c0
yay, they talk and they don't fight
2017-08-10 18:31:44 +02:00
1c526feffb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-10 18:06:58 +02:00
b3d349bf80
Merge branch 'staging' into pad2
2017-08-10 14:53:12 +02:00
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-10 14:49:41 +02:00
0dde1d7507
wip
2017-08-10 14:49:21 +02:00
baf64114a6
point to homepage in drive
2017-08-10 14:45:56 +02:00
c304071492
wip
2017-08-09 17:37:55 +02:00
e49a42db18
Merge branch 'staging' into pad2
2017-08-09 16:28:51 +02:00
1f9bd866c3
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-09 16:06:46 +02:00
edad5deeac
fix logo not showing sometimes in chrome
2017-08-09 16:06:29 +02:00
52565076b9
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-09 14:48:06 +02:00
4b25ab80d6
wip
2017-08-09 14:45:39 +02:00
844967a880
continued refactoring
2017-08-09 14:20:37 +02:00
a4aeada585
make the file dialog placeholder visible, center file list
2017-08-09 11:20:46 +02:00
e08ed72653
generate the tooltip after the button
2017-08-09 11:11:53 +02:00
665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended
2017-08-09 11:06:06 +02:00
34ba673cd3
improve file upload UI
2017-08-09 10:54:20 +02:00
34a5a32c44
lint compliance
2017-08-08 20:29:02 +02:00
cdf3cee9c8
split out message rendering into ui
2017-08-08 18:21:03 +02:00
fcdfa52aa9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-08 17:13:38 +02:00
58b3b32cc3
big messaging refactor. split UI from logic
2017-08-08 17:13:10 +02:00
6ca6755d02
more missing titles in toolbar
2017-08-08 16:51:23 +02:00
d3f2398865
bump tippy to 1.2.0, add dynamicTitle option
2017-08-08 16:19:44 +02:00
8301bd44be
Merge pull request #164 from pbondoer/staging
...
UI improvements
2017-08-08 14:46:25 +02:00
f585ddccdf
fix image sizes in /slide/
2017-08-08 11:44:01 +02:00
fc95f1b6a8
lint compliance
2017-08-08 10:32:25 +02:00
ba9696ba33
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-08 10:03:54 +02:00
a612f02be2
Merge branch 'staging' into pad2
2017-08-07 17:49:03 +02:00
c63807fd2b
implement channel.send
2017-08-07 17:24:16 +02:00
35a55a15ed
wip
2017-08-07 17:23:28 +02:00
d835005905
simplify in-memory message format
2017-08-07 17:22:56 +02:00
8f285eba9f
make file picker ui even prettier
2017-08-07 17:22:54 +02:00
797cc2b105
handle messages which fail to decrypt
2017-08-07 17:21:23 +02:00
65dfd99171
major wip
2017-08-07 16:27:57 +02:00
c53e738054
improve file picker ui
2017-08-07 16:27:29 +02:00
bad5160885
fix bad reference
2017-08-05 09:14:36 +02:00
05aa5ed347
hide new feature until it is finished
2017-08-04 18:07:47 +02:00
395f6e1b27
reset confirm text for alertify
2017-08-04 15:54:15 +02:00
9865359bb0
don't tell users about new versions
2017-08-04 14:05:00 +02:00
c8c44d3bfc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-04 11:22:22 +02:00
0d1f19f5d4
Big manual merge
2017-08-04 11:20:17 +02:00
f6d45d05f6
use logo in toolbar
2017-08-04 11:01:26 +02:00
11c72499a0
don't add duplicate messages to the history
2017-08-03 17:06:28 +02:00
52854c5a8e
ignore history range responses
2017-08-03 15:05:04 +02:00
e786117110
get new messages when reconnecting and WIP get more history
2017-08-03 15:04:29 +02:00
2ce341fed6
disable input field when disconnected
2017-08-03 14:12:07 +02:00
66d81429bd
integrate file embed into code editor
2017-08-03 11:47:54 +02:00
8b0831ac5d
save images drawn with whiteboard to your CryptDrive
2017-08-02 16:51:41 +02:00
fe826133b3
make some markdown styles reusable
2017-08-02 11:03:06 +02:00
35cf23ce2c
clear tooltips when redrawing the userlist
2017-08-01 11:50:43 +02:00
4c6f8d71e1
don't invoke spinner if it does not exist
2017-08-01 11:08:25 +02:00
311f709dc4
lint compliance
2017-07-31 17:15:17 +02:00
c147d342a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-31 15:45:50 +02:00
542d0cd17f
drop support for legacy pad list
2017-07-31 15:34:56 +02:00
93e007b52a
reduce png sizes
2017-07-31 15:11:35 +02:00
3fa010027c
implement clearTooltips
2017-07-31 12:29:41 +02:00
a68a225d79
fix read-only synchronization bug
2017-07-31 12:21:48 +02:00
796bf89491
Update of the front-page
2017-07-24 17:56:54 +03:00
658b00814b
TodoApp - Style and translations
2017-07-23 16:08:49 +03:00
ae693ff5a7
lint compliance
2017-07-23 09:01:12 +02:00
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-22 14:15:15 +02:00
55cb0734e2
make bad state timeout configurable
2017-07-22 10:56:39 +02:00
469f49fc0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 18:32:12 +02:00
a80b00a765
Move the file picker in common
2017-07-20 18:32:03 +02:00
d44f0696af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 18:24:53 +02:00
2d0635a409
use custom version of tippy
2017-07-20 18:23:51 +02:00
09793e0d7d
jshint
2017-07-20 18:21:10 +02:00
683769f30a
Fix tooltips
2017-07-20 18:19:59 +02:00
9633025afe
CSS for the removeHistory button in contacts
2017-07-20 17:26:33 +02:00
97f1bbedc5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 17:08:28 +02:00
b9bba76b4e
Make the delay for tooltips configurable
2017-07-20 17:08:11 +02:00
dd98e2222a
WIP erase chat history button
2017-07-20 17:04:11 +02:00
128d5b2c6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 15:55:17 +02:00
b22127f10c
add history removal
2017-07-20 15:55:04 +02:00
a5a73ce326
Fix print button in slide
2017-07-20 14:41:51 +02:00
140964478e
Enter + shift key to add a new line in chat
2017-07-20 09:54:44 +02:00
e26e041a5b
fix jshint errors
2017-07-19 17:24:35 +02:00
c33d2a2db0
New tooltips
2017-07-19 17:14:10 +02:00
b56a782f01
Store the userlist state when it is closed using the icon
2017-07-19 14:38:46 +02:00
82c87144cb
Remove the friend request button when the request is sent
2017-07-19 14:14:34 +02:00
5ce49af57b
Make CryptDrive fast again
2017-07-19 11:36:00 +02:00
e2d031c76a
Add support for markdown syntax in contacts
2017-07-19 10:29:59 +02:00
cba113a2b0
Lint
2017-07-18 15:52:46 +02:00
91ebbdfdb4
View contact status
2017-07-18 15:50:21 +02:00
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
2017-07-18 10:57:37 +02:00
f719b34e09
Add tab notification in contacts
2017-07-18 10:42:23 +02:00
baf439648e
Add the contacts app in the dropdown menu
2017-07-18 10:22:51 +02:00
36d792874a
Fix initial text not removed in /contacts
2017-07-18 10:13:29 +02:00
df0442c2bf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:40:27 +02:00
eb4b5ca77c
stub history removal. coming soon
2017-07-17 18:39:44 +02:00
aa8181ab2b
Contacts app translations
2017-07-17 18:34:46 +02:00
73e32f273e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:08:07 +02:00
009d01abde
Fix friend removal and update user data
2017-07-17 18:07:58 +02:00
1aecdeb075
fresh media tag build
2017-07-17 11:08:39 +02:00
7114bfaa52
lint compliance
2017-07-13 21:09:29 +02:00
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
96d2ff67e1
user-plus as icon for add-friend
2017-07-13 15:22:11 +02:00
c3ba7cd792
fix race condition
2017-07-13 12:55:08 +02:00
d0d38aa2a3
feedback on first visit
2017-07-13 11:03:56 +02:00
9527a5def7
avoid a CSP error. silence pdfjs warnings
2017-07-13 10:58:45 +02:00
9707433944
comment out debugging info
2017-07-13 10:57:51 +02:00
575d4612f9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 18:56:12 +02:00
eda9908c3b
prevent accessing attributes of null
2017-07-12 18:56:04 +02:00
eeb2ee2d17
add clear channel rpc
2017-07-12 18:55:29 +02:00
89af8e4472
fix funny off-by-one thing
2017-07-12 18:49:33 +02:00
ac684a8dc7
Use the APP toolbar in profile
2017-07-12 18:34:16 +02:00
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 14:34:57 +02:00
b3e225cb3b
Replace spinner by text and fix mobile UI
2017-07-12 14:33:28 +02:00
f450a28d11
improve logic for guessing titles within code documents
2017-07-12 11:09:53 +02:00
0483d15b8f
lint compliance
2017-07-12 10:55:42 +02:00
c0cb5c4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 10:46:15 +02:00
f4bca0f9c0
Modifications for latest media-tag
...
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
2017-07-12 10:44:40 +02:00
5b3cca58bd
modifications to handle latest media-tag
2017-07-12 10:44:03 +02:00
7f5c301734
Add display name in the settings useradmin menu
2017-07-11 18:50:41 +02:00
fb21a650ce
Lint errors
2017-07-11 17:40:13 +02:00
159ccc2866
Fix mediatag flickering
2017-07-11 17:39:08 +02:00
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
2017-07-11 11:56:06 +02:00
438e7e6cf9
Fix display name in useradmin (friends app)
2017-07-10 13:04:33 +02:00
e6188bfb63
Fix useradmin dropdown position
2017-07-10 12:38:54 +02:00
97d8d86395
Fix avatar in static pages
2017-07-10 12:03:44 +02:00
e8f3df5a46
Clean less
2017-07-10 11:57:04 +02:00
159d72f33b
Merge branch 'msg' into staging
2017-07-10 11:48:22 +02:00
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:46:16 +02:00
ff10c282d4
Avatar in the user admin button
2017-07-10 11:46:06 +02:00
be6ee672d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:16:52 +02:00
f0523a0153
Avatar in the user admin menu
2017-07-10 11:16:44 +02:00
e10de1219b
feedback on view hash usage
2017-07-10 11:13:56 +02:00
52eb8e307c
feedback for language used
2017-07-10 10:59:32 +02:00
1c531ccd47
Pin the chat channels
2017-07-10 10:39:57 +02:00
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
2017-07-10 10:34:25 +02:00
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-10 09:30:44 +02:00
22fbc7e5d8
implement getter for public keys
2017-07-10 09:21:27 +02:00
df103c4074
Messaging app
2017-07-07 18:53:21 +02:00
1c462d5c4a
use random token for feedback instead of date
2017-07-07 10:16:54 +02:00
21f1527c71
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:39:06 +02:00
5c7441f82c
Display the friend list in the friend app
2017-07-06 18:38:58 +02:00
fac715dd09
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:35:21 +02:00
4b23ef74d7
add support for curve message signing and curve validateKeys
2017-07-06 18:30:16 +02:00
a5e8f6ae81
Add friend app and fix avatar size
2017-07-06 18:00:03 +02:00
af31771e3a
Share a channel id, not a hash
2017-07-06 14:47:02 +02:00
852b2eaf1d
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 14:27:32 +02:00
26a83003b5
Create an owned channel
2017-07-06 14:27:13 +02:00
5b5a7ab286
Hide the friend button when the resquest is accepted
2017-07-06 12:31:31 +02:00
d3bbdc27c0
lint compliance
2017-07-06 10:33:31 +02:00
bce0b03ba4
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 10:25:53 +02:00
909e00bbc3
create a listmap object using public key crypto
2017-07-06 10:25:43 +02:00
96fde4e5ed
Add missing file
2017-07-06 10:24:28 +02:00
df53166b37
implement and use prototype curve encryptors
2017-07-06 10:22:20 +02:00
d293ba4d44
add support for invite hashes
2017-07-06 09:44:39 +02:00
37d5b0afb9
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-05 18:42:51 +02:00
95e2efab89
Add to friend list
2017-07-05 18:42:32 +02:00
e353627204
log users out if they do not have curve keys. add curve keys to object on registration and login.
2017-07-05 17:19:28 +02:00
4016a95540
prototype invite app
2017-07-05 16:01:50 +02:00
465ef74f2b
Fix rpc
2017-07-05 16:02:22 +02:00
bf17ad3f1e
Friend button in the userlist
2017-07-05 15:59:36 +02:00
8dc8aa27ab
Lint
2017-07-05 12:27:40 +02:00
35e8c1a63b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-05 12:27:08 +02:00
43ac71603c
Move pad attributes in pad data
2017-07-05 12:26:42 +02:00
9f6ecea5d9
fix nacl reference error in media tag
2017-07-05 11:57:53 +02:00
69f4ce2abd
Fix middle click on the drive button
2017-07-04 17:03:54 +02:00
cbd9fc4076
Merge branch 'staging'
2017-07-04 17:03:20 +02:00
3fe0baa956
disable pin limit caching
2017-07-04 15:50:52 +02:00
9c1eaf9c1a
lint compliance
2017-07-04 15:48:20 +02:00
cab595f959
Fix duplicate folders in the drive
2017-07-04 14:51:35 +02:00
ansuz