76af3b90a7
stub createUnpinnedWarning0
2017-12-12 13:47:24 +01:00
7b8321c263
make a test fail so we don't forget to fix the bug
2017-12-12 13:43:55 +01:00
a863011a0c
Fix profile in read-only mode
2017-12-12 12:14:32 +01:00
0d05d880ee
Fix the bounce app
2017-12-12 10:47:01 +01:00
b30efff5d1
Better way to check if we're using the safe origin in bounce
2017-12-12 10:44:20 +01:00
b1765c6ae3
Fix pad creation screen with anonymous users
2017-12-11 17:58:59 +01:00
c269929319
Fix creation page not displayed in pad and slide
2017-12-11 17:17:06 +01:00
362104ec09
lint compliance
2017-12-11 14:49:41 +01:00
89cc583f53
Call the handler if onReady is called for a ready channel
2017-12-11 12:48:06 +01:00
dcfccf88cd
Merge branch 'creationpage' into staging
2017-12-11 12:21:21 +01:00
353b146644
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-11 12:21:17 +01:00
1922dbfd75
Creation page with mobile support
2017-12-11 12:19:44 +01:00
dd44b4da99
Removed old /less/ directory which is nolonger used :)
2017-12-08 14:56:13 +01:00
7a09bf43eb
Fix a truly silly mistake in rpc.js and make the pad-not-pinned message get removed if a registered user joins
2017-12-08 14:46:32 +01:00
008b2cc67e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-08 14:01:02 +01:00
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
06422e6d5a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-08 11:47:55 +01:00
38bd27303b
WIP rpc framework
2017-12-08 11:47:07 +01:00
617c4b6044
CSS refactorings and pad-is-not-pinned work
2017-12-07 19:00:13 +01:00
e96d54e655
Add a pad creation page
2017-12-07 18:51:50 +01:00
0080dd7624
Fix codemirror width with small screens in the code app
2017-12-07 17:28:05 +01:00
4377f2cee7
Fix missing translations in the drive
2017-12-07 12:20:26 +01:00
203c5d64c1
Focus codemirror after using the markdown toolbar
2017-12-07 12:18:14 +01:00
e72270d4a4
Add feedback when sharedworker is defined
2017-12-07 10:50:45 +01:00
1ac4abc482
Remove old code
2017-12-07 10:35:48 +01:00
64303b4090
Merge branch 'refactor' into staging
2017-12-07 10:34:15 +01:00
3e064e6638
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-06 18:33:16 +01:00
604ea1c95f
Feedback about webworkers
2017-12-06 18:32:48 +01:00
ba74f9d37a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-05 18:32:29 +01:00
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
61935500f4
Lint compliance
2017-12-05 18:10:53 +01:00
9eb33e39e6
Enable change events in the drive
2017-12-05 18:09:43 +01:00
c702a23c77
Initial work on the 'pad will expire' logic
2017-12-05 17:48:30 +01:00
17636769e4
Remove the second network created for the drive
2017-12-05 16:40:04 +01:00
291eb57027
fix auth app
2017-12-05 15:07:35 +01:00
52712c4bb9
Use the network from the async store for pads
2017-12-04 19:16:38 +01:00
e397f66b56
lint compliance
2017-12-04 15:27:48 +01:00
de7806504b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-04 15:03:57 +01:00
f52d987515
Ability to resize avatars before uploading them
2017-12-04 15:03:43 +01:00
34223e4b78
remove accidental inclusion
2017-12-04 13:59:57 +01:00
0b54a76211
lint compliance
2017-12-04 13:58:33 +01:00
cd29208267
fix toolbar's incorrect gotoDrive title
2017-12-04 11:46:15 +01:00
e85e2dcabd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-04 11:41:45 +01:00
d3d9e2e771
WIP: refactoring rpc code
2017-12-04 11:10:25 +01:00
afcc888a8b
make flat dom quiet again
2017-12-04 10:16:17 +01:00
e164edec03
Fix the webworker app
2017-12-01 18:29:59 +01:00
b14228da18
Merge branch 'staging' into refactor
2017-12-01 17:04:03 +01:00
c59c6072f3
Remove jquery from outer
2017-12-01 16:05:23 +01:00
fc027ba00b
Test webworker app
2017-12-01 15:03:01 +01:00
c6b8bbea59
Fix tests
2017-12-01 14:56:34 +01:00
04e02871bc
Merge branch 'refactor2' into staging
2017-12-01 14:50:19 +01:00
4903bd0757
Enable messenger in async store
2017-12-01 14:49:21 +01:00
bd85f1b003
Fix file upload and remove unnecessary dependencies
2017-12-01 10:16:48 +01:00
7c8572c99d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-30 18:32:27 +01:00
5187b3f26c
Flow compliance and fix a few bugs in rpc.js
2017-11-30 18:32:20 +01:00
664625a6ef
Fix more async store issues
2017-11-30 18:22:26 +01:00
d1277d7026
Merge branch 'staging' into refactor2
2017-11-30 17:25:23 +01:00
3f892e04a5
fix codemirror overflow css
2017-11-30 17:24:43 +01:00
5c3237e093
Fix issues with the async store
2017-11-30 17:21:58 +01:00
b3688db202
Use async store
2017-11-30 15:01:17 +01:00
0840570fbf
Async store part 1
2017-11-30 10:33:09 +01:00
96cf83af34
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 18:26:11 +01:00
385ac9607c
pass 'self' into common-util instead of using window
2017-11-27 18:26:04 +01:00
acd8ab7446
Add the markdown toolbar in profile
2017-11-27 18:10:37 +01:00
b0a384e8e0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 17:55:48 +01:00
74e59a513a
Add the markdown toolbar to the slide and poll apps
2017-11-27 17:55:20 +01:00
22c5ff757b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 15:05:07 +01:00
650d26afea
use unified listmap in profile app
2017-11-27 15:04:59 +01:00
68d602f74a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 14:44:57 +01:00
644f6e9985
Use the bounce app to open links from inner
2017-11-27 14:44:44 +01:00
5eacc158d9
make tests pass again
2017-11-27 13:45:40 +01:00
812df7de6f
Merge branch 'merge-staging' into staging
2017-11-27 12:18:34 +01:00
be5c5831dd
lint compliance
2017-11-27 12:18:04 +01:00
444ba91287
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 12:17:46 +01:00
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
2017-11-27 12:17:35 +01:00
77c81f2426
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
2017-11-27 12:16:47 +01:00
4ff4ccd1d3
use faster and more correct 'find' implementation
2017-11-27 11:30:50 +01:00
e3f04ef076
Merge branch 'soon' into staging
2017-11-27 11:11:49 +01:00
71cf3a4ddf
fix creation of personal todo list
2017-11-27 11:09:28 +01:00
701af29192
fix broken register/login process
2017-11-24 15:12:00 +01:00
a3c093838c
merge latest staging and resolve conflicts
2017-11-24 13:46:59 +01:00
56102d3689
use unified listmap
2017-11-24 13:40:21 +01:00
661db129b2
lint compliance
2017-11-24 10:32:58 +01:00
80978377f2
return transformed cursor value
2017-11-24 10:03:45 +01:00
2e00214783
drop unreachable code
2017-11-23 16:57:01 +01:00
ee6c2097f5
resolve merge conflicts
2017-11-23 16:56:49 +01:00
9795ac32cb
Ability to burn an anonymous drive from the browser
2017-11-23 14:36:42 +01:00
4b5abdecbe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-23 12:29:32 +01:00
280a7c2765
Clean cryptpad-common
2017-11-23 12:28:49 +01:00
98c2b0c802
Merge branch 'soon' into staging
2017-11-22 17:38:49 +01:00
3ff0eb116b
don't let search interfere with renaming
2017-11-22 17:23:14 +01:00
eba1c9dfac
Add chainpad log to the debug app
2017-11-21 18:50:33 +01:00
a660c03f97
Fix scrollbar in the debug app
2017-11-21 17:42:50 +01:00
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-21 17:37:53 +01:00
06011065d2
Add a debug app
2017-11-21 17:37:38 +01:00
60c4973d62
resolve merge conflicts
2017-11-21 17:22:06 +01:00
585f9d2e4e
repair broken 'clear channel' button
2017-11-21 17:19:35 +01:00
000f3edd1d
Constants file
2017-11-21 16:47:19 +01:00
477f14bb8b
Put constants in a separate file
2017-11-21 16:46:19 +01:00
9d662bd337
fix right-click pad creation in drive
2017-11-21 15:21:37 +01:00
d726c95f0b
fix namespace collision
2017-11-21 15:10:28 +01:00
c8a9afb6c8
remove duplicate loading screen
2017-11-21 15:09:53 +01:00
7f88d1d43a
Improve drive loading speed
2017-11-21 11:09:59 +01:00
06ede6b294
Fix export in apps using framework
2017-11-21 10:26:33 +01:00
c35e3d644e
Make sure dates are stored as numbers in the drive
2017-11-20 15:37:23 +01:00
655dfe971d
Add translation for the edit username button in the userlist
2017-11-20 14:28:35 +01:00
eb88efd83f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-20 14:17:37 +01:00
80803ad076
Fix empty codemirror after thumbnail creation
2017-11-20 14:17:29 +01:00
a8d5a68eb5
open links correctly in contacts app
2017-11-20 14:06:19 +01:00
7441a68fb9
update test after merging api changes
2017-11-20 12:22:26 +01:00
d1beb6493b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-20 12:20:13 +01:00
b96ea47f1f
strip tracking parameters when parsing urls
2017-11-20 12:09:17 +01:00
e2cf46d725
Add new keyboard shortcuts for the drive search
2017-11-20 11:50:52 +01:00
cf26c4c286
Improve the toolbar UI for smaller screens
2017-11-17 18:21:45 +01:00
fc02f97d78
Use less2 classes in the user menu
2017-11-17 18:20:45 +01:00
41a082c46d
Fix video thumbnails
2017-11-17 18:20:02 +01:00
fd258fc277
Fix preview button tooltip in code
2017-11-17 18:19:35 +01:00
fe9261f6a2
Fix modules order in TODO
2017-11-17 18:19:11 +01:00
af8aa25228
Add an option to never rename a file during the session
2017-11-17 10:57:54 +01:00
31b31654ec
Lint compliance
2017-11-16 18:57:33 +01:00
25d3d321da
Ability to rename a file before uploading it to the server
2017-11-16 18:11:13 +01:00
2813b7219e
Fix the public key using the wrong domain in settings
2017-11-16 13:35:07 +01:00
a96e49d55a
Fix filepicker creating a new netflux network when initialized
2017-11-15 16:56:50 +01:00
630ac45948
Fix laggy and blinking tooltips
2017-11-15 16:31:26 +01:00
1f53304ad3
Display a dropdown menu inside another one
2017-11-15 15:35:28 +01:00
014e12b5b5
Ability to update the username from the userlist
2017-11-15 11:32:54 +01:00
bdd24ed14f
lint
2017-11-14 11:57:13 +01:00
7cfe64fc5b
Remove cryptpad-common dependency for some inner apps
2017-11-13 18:09:19 +01:00
1514ad5df3
Move the 'logged out' screen inside the sframe
2017-11-13 17:29:00 +01:00
5a2afb5c95
Remove Realtime and Messaging from common
2017-11-13 17:01:09 +01:00
30c8c253dd
Remove util and hash from common
2017-11-13 16:32:40 +01:00
c9e1de042c
Remove common-interface dependency from cryptpad-common
2017-11-13 12:00:26 +01:00
dc207393fd
Separate UI elements from cryptpad-common
2017-11-13 10:23:18 +01:00
50da6b3b2e
Needs to be handled in chainpad-listmap
...
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"
This reverts commit eaa7b6e8e5
2017-11-11 01:34:20 +01:00
eaa7b6e8e5
Do content checks on the drive so if it gets corrupted, the patch will be rejected
2017-11-11 01:26:54 +01:00
354c63bd64
Clean old code
2017-11-09 18:17:49 +01:00
ac66511f0a
Merge branch 'staging' into new-diff
2017-11-09 17:44:45 +01:00
be848c1bec
Fix broken readonly link in drive
2017-11-09 17:27:50 +01:00
f931574dac
lint compliance
2017-11-09 17:23:13 +01:00
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
2017-11-09 17:07:04 +01:00
840cd91bcb
manual merge
2017-11-09 15:38:32 +01:00
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
2017-11-09 15:36:49 +01:00
cf5ccf04f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-09 14:23:54 +01:00
101482b8cc
Migrate settings to use a sandboxed iframe
2017-11-09 14:23:40 +01:00
7f8147b18b
Merge branch 'soon'
2017-11-07 15:06:57 +01:00
c1ba08cfc6
Make sure thumbnails are .png
2017-11-07 15:04:45 +01:00
0956905ca8
Wipe localForage on log out
2017-11-07 14:56:50 +01:00
6b9ffe8dd1
Make thumbnails more secure
2017-11-07 14:51:53 +01:00
454fc8498c
remove old* apps
2017-11-07 13:50:07 +01:00
e07bb0f7b3
roll back to old transform function, except in pad
2017-11-06 17:18:10 +01:00
a592317e35
lint compliance
2017-11-06 15:49:40 +01:00
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
2017-11-06 15:47:18 +01:00
9060464f37
Create thumbnails only when the tab is not focused
2017-11-06 13:36:54 +01:00
a37e6c7979
lint compliance
2017-11-03 18:39:06 +01:00
2a3a5c4342
Ability to disable thumbnails
2017-11-03 18:38:27 +01:00
5dff9a32b6
Fix comments order in polls
2017-11-03 18:38:04 +01:00
1871749b6f
Fix -1 viewer in the userlist when disconnected
2017-11-03 15:14:23 +01:00
cf3024ef5b
Ability to display an error in the toolbar state
2017-11-03 14:30:59 +01:00
8de9a596f1
Fix cursor in thumbnails
2017-11-02 19:11:27 +01:00
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
2017-11-02 17:47:19 +01:00
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
2017-10-31 18:19:30 +01:00
5438970ab4
typo
2017-10-31 11:30:13 +01:00
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
2017-10-31 11:11:29 +01:00
7f9b21405b
Add missing files for profile
2017-10-31 10:27:41 +01:00
e99836bae2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 18:49:43 +01:00
4250688856
Migrate profile to use sframe
2017-10-30 18:49:28 +01:00
744809101c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 16:24:55 +01:00
867df1db56
fix '+New' button in drive toolbar
2017-10-30 16:24:41 +01:00
907e2cb517
lint compliance
2017-10-30 15:13:27 +01:00
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 15:12:29 +01:00
68accaf653
Todo in sframe with less2
2017-10-30 15:12:15 +01:00
11b8b380fd
Merge branch 'staging' into evilham
2017-10-30 14:50:11 +01:00
04f26ff886
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
2017-10-30 14:41:21 +01:00
0a14c715ad
add test for support of invite urls
2017-10-30 14:40:43 +01:00
5dcfbd07ab
Merge branch 'theming-improvement' into staging
2017-10-27 18:32:08 +02:00
4933aafbc8
Added default values to avoid breaking existing themes.
2017-10-27 18:31:52 +02:00
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
2017-10-27 14:20:31 +02:00
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 14:14:25 +02:00
1cbf1aec92
prevent undefined access in non-sframe apps
2017-10-27 14:14:19 +02:00
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 13:31:54 +02:00
1245b4d244
Enable thumbnails in poll and whiteboard
2017-10-27 13:31:41 +02:00
d644054e3f
lint compliance
2017-10-27 11:13:26 +02:00
ed253e6c75
Merge branch 'staging' into evilham
2017-10-27 11:03:16 +02:00
df1a700cb2
disable thumbnail test. add test for flat dom
2017-10-27 11:01:22 +02:00
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 10:44:53 +02:00
69890ebd8f
prototype alternate datastructure for trees in listmap
2017-10-27 10:43:44 +02:00
23c305f71f
implement removeItem so localForage doesn't complain
2017-10-27 10:37:44 +02:00
735f0a7e30
Merge branch 'theming-improvement' into staging
2017-10-26 20:44:56 +02:00
83da9cf752
Moved colours to colortheme.less to enable theming
2017-10-26 20:29:14 +02:00
8251247da2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-26 12:31:33 +02:00
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
98c66ef8f6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-25 13:04:08 +02:00
bf817f20ee
Fix file upload in code and slide
2017-10-25 12:31:22 +02:00
f031af4e9d
fix broken media-tags in contacts
2017-10-25 10:50:17 +02:00
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:50:19 +02:00
f4adbd980e
Thumbnails for the code app
2017-10-24 18:49:58 +02:00
ba97aa7ad2
allow file upload handler to create thumbnails for whiteboard
2017-10-24 18:09:38 +02:00
6157c57a4b
disable color palette when interface is not editable
2017-10-24 17:59:19 +02:00
8359902f6a
fix typo in poll
2017-10-24 17:42:08 +02:00
69f9a7ebf3
make userlist change notifications configurable
2017-10-24 17:29:58 +02:00
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:03:31 +03:00
aa37997aa3
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
2017-10-24 18:02:03 +03:00
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 16:56:13 +02:00
dc90811090
only call onReady once in sframe-listmap
2017-10-24 16:56:08 +02:00
bac10472f3
lint compliance
2017-10-24 14:32:47 +02:00
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 14:31:56 +02:00
18b5b20d27
Add thumbnails for PDFs
2017-10-24 14:31:42 +02:00
aee51f1317
lint compliance
2017-10-24 14:02:29 +02:00
447b0a74ee
handle errors for videos when uploading
2017-10-24 13:45:27 +02:00
30a69fae13
Add thumbnails for videos
2017-10-24 12:26:04 +02:00
21f8ae7570
Keep the correct ratio for image thumbnails
2017-10-24 11:45:07 +02:00
2dd3c42fd5
Fix handlers registered again on reconnect in drive and poll
2017-10-24 10:42:08 +02:00
a0bcb901d3
Add titles in poll when options or usernames are overflowing
2017-10-23 15:16:51 +02:00
74985fd0f2
Use text for the addUser button in polls
2017-10-23 15:12:27 +02:00
6db5a34323
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:53:42 +02:00
c17fc2efe7
improve option order in poll
2017-10-23 14:53:31 +02:00
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:39:31 +02:00
13718d0263
Fix recent pads in chrome
2017-10-23 14:38:38 +02:00
2e5fdf709a
Merge branch 'soon' into staging
2017-10-23 14:29:01 +02:00
de8339fea7
hide alertify when you are in presentation mode
2017-10-23 14:25:25 +02:00
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:22:54 +03:00
d7e9498143
Fix and then disable the new OT
2017-10-23 14:22:33 +03:00
288e141c1f
add missing sframe method
2017-10-23 12:33:50 +02:00
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
2017-10-23 10:55:40 +02:00
3e4faf1be1
Add new state messages in the toolbar
2017-10-20 18:12:47 +02:00
6d080bcb45
Ability to export mediatag images in pad
2017-10-20 18:10:08 +02:00
a0dd867f33
Fix pending state not removed after friend invite rejected
2017-10-20 18:09:09 +02:00
c25be21138
Fix the upgrade button in the drive
2017-10-20 10:16:01 +02:00
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-20 10:26:27 +03:00
a3c7aa67d8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-19 19:07:00 +02:00
094856a511
Fix renaming pad with multiple dots in the name in drive
2017-10-19 18:30:55 +02:00
bf832ba784
fix comment overflow
2017-10-19 17:30:40 +02:00
7bc2f81852
Fix pinned column not always stored in polls
2017-10-19 16:01:56 +02:00
88e7f9a218
Add last access and creation times in the properties window in drive
2017-10-19 15:05:55 +02:00
22e3baed4b
Fix sort issues in drive
2017-10-19 15:00:29 +02:00
f43606f71d
Present mode to display only the parsed markdown in code
2017-10-19 14:39:38 +02:00
515214aed1
Use present mode in embed code
2017-10-19 11:59:07 +02:00
201c974df6
Merge branch 'thumbnails' into staging
2017-10-19 11:43:43 +02:00
7b8490ad20
Use less2 in contacts
2017-10-19 09:58:28 +02:00
dd63cd13d7
Fix profile page title
2017-10-18 16:59:20 +02:00
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
2017-10-18 14:49:50 +03:00
9e4c48f537
lint errors
2017-10-18 12:25:13 +03:00
a149152f11
Merge branch 'staging' into framework
2017-10-18 11:42:31 +03:00
4197b7b968
Fix missing icon in list mode for files with thumbnail
2017-10-17 17:23:31 +02:00
d941b1098a
Remove selection in whiteboard when uploading to the drive
2017-10-17 17:21:15 +02:00
4116d08dd1
Display thumbnails in the drive and then file picker
2017-10-17 17:17:31 +02:00
6920129126
Embed images from the drive in whiteboard
2017-10-17 12:19:57 +02:00
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
2fd120100a
Merge branch 'wb' into staging
2017-10-13 16:58:59 +02:00
15337603bb
Merge branch 'staging' into framework
2017-10-13 13:41:24 +03:00
a6b34491fc
freeze the editor when reconnecting
2017-10-13 13:40:51 +03:00
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
2017-10-13 13:39:49 +03:00
a859ab081a
Fix fouc in drive
2017-10-12 18:21:34 +02:00
7b6432f134
Lint
2017-10-12 18:20:33 +02:00
6926d42292
Autoload template picker to make it faster to appear when used
2017-10-12 18:18:01 +02:00
1c8e1a36e8
Add file type in the pad attributes for existing files
2017-10-12 17:43:49 +02:00
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
2017-10-12 17:33:22 +02:00
88d0a2b8a6
Merge branch 'master' into staging
2017-10-12 17:08:34 +02:00
5ed60a0ad7
Fix image ratio in slides
2017-10-12 16:45:51 +02:00
753e2d797e
Merge branch 'staging' into framework
2017-10-12 17:07:10 +03:00
62bc72847f
Add an error message when trying to tag a deleted pad
2017-10-12 15:06:29 +02:00
c773b5d076
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
2017-10-12 15:42:09 +03:00
69dd3a60ab
Hide template and fileupload buttons for anonymous users
2017-10-12 14:32:12 +02:00
8e1f15e88d
Get title suggestion based on poll's description
2017-10-12 14:12:26 +02:00
e317265594
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-10-12 14:09:55 +02:00
0d912402e5
patch for bug in Firefox ESR
2017-10-12 14:09:48 +02:00
91381ca77d
Fix lint errors
2017-10-12 12:20:27 +02:00
50090a3af6
Add placeholders for the comment form in poll
2017-10-12 12:18:32 +02:00
95ad25973e
Ability to delete a stronger pad from readonly mode
2017-10-12 11:41:53 +02:00
b28c1537e8
Fix history in readonly mode
2017-10-12 10:59:23 +02:00
620ba4ed5d
Fix fouc in drive
2017-10-11 17:15:56 +02:00
b31bbebf7b
Buttons are missing in whiteboard when zoomed in
2017-10-11 17:11:38 +02:00
a5a08176fb
Merge branch 'master' into staging
2017-10-11 16:58:45 +02:00
54b5a2d654
Fix style issues in poll (Chrome)
2017-10-11 16:01:26 +02:00
86767184da
Fix style issues in poll for Edge
2017-10-11 15:38:23 +02:00
00e8d32d60
Fix column position in poll for Chrome
2017-10-11 15:37:47 +02:00
b110e1b8da
Fix style issues in poll for Edge
2017-10-11 15:37:11 +02:00
ecb537ac7f
Move code to render.js in poll
2017-10-10 18:19:49 +02:00
75b3ff9c60
CSS issue in polls
2017-10-10 11:35:24 +02:00
c46280d032
Fix style issues for Edge
2017-10-10 11:32:52 +02:00
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
2017-10-09 17:20:23 +02:00
f0bdc3b26f
second try
2017-10-09 16:57:30 +02:00
d50a692986
add note about tags to prompt
2017-10-09 16:51:57 +02:00
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
2017-10-09 17:07:26 +03:00
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-09 15:38:08 +02:00
484e216054
Fix hashtag button in the toolbar
2017-10-09 15:37:37 +02:00
4c19375f4d
Avoid missing characters in poll's inputs
2017-10-09 15:11:02 +02:00
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02:00
dd141b5c9f
Disable comments when a poll is not published
2017-10-09 14:08:54 +02:00
36aee2d174
lets try normalizing the dom before applying a patch
2017-10-09 14:13:11 +03:00
828a685ba8
Fix broken browser fight logging
2017-10-09 14:12:55 +03:00
aa744567ed
Fix thumbnails in sframe apps
2017-10-09 11:52:34 +02:00
5e7bf0cfb8
Embed an image in whiteboard
2017-10-09 10:32:24 +02:00
f0eb58ee95
Merge branch 'staging' into framework
2017-10-06 14:50:35 +03:00
9509d538e0
Cursor not being updated at the right times before applying a patch.
2017-10-06 14:49:52 +03:00
888028c542
Lint
2017-10-05 18:13:28 +02:00
e5a54b5978
Fix folder highlighting with drag&drop in the drive
2017-10-05 18:12:23 +02:00
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
2017-10-05 18:07:05 +02:00
ab3648a30a
Merge branch 'newpoll' into staging
2017-10-05 17:56:17 +02:00
1c4f1c785d
Improve stability and UI in poll and its comments
2017-10-05 17:54:07 +02:00
7559bc062e
lint compliance
2017-10-05 17:06:02 +02:00
503111d26a
use recompiled media-tag
2017-10-05 17:00:47 +02:00
427afc3954
override modified file name in pdfjs
2017-10-05 16:59:55 +02:00
d85db64939
add tags from drive
2017-10-05 16:58:34 +02:00
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
2017-10-05 16:12:49 +03:00
ae87320408
Preview pane cannot be resized after it has been hidden and then shown again
2017-10-05 16:12:24 +03:00
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +02:00
c936e5ae73
make context menu open correct app on correct port
2017-10-05 11:14:47 +02:00
d9e97b86e6
Merge branch 'staging' into framework
2017-10-05 12:14:37 +03:00
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
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-05 10:22:07 +02:00
a90c078e84
correct reference to undefined
2017-10-05 10:21:59 +02:00
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
5304dc319f
Enable redirection to the previous page after registration
2017-10-04 15:55:57 +02:00
ceb8ff18bd
Fix ghost icon in drive
2017-10-04 15:52:09 +02:00
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
2017-10-04 15:39:18 +02:00
68bda92291
Use codemirror for description in poll
2017-10-03 19:04:29 +02:00
b8ce149db6
add hint about tag usage
2017-10-03 18:36:34 +02:00
f15ec4efe9
add tagging to whiteboard and file apps
2017-10-03 18:05:28 +02:00
f90742603e
style fixes
2017-10-03 17:53:28 +02:00
d6570ad9f2
Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
2017-10-03 17:57:57 +03:00
707d3b3e94
Ability to export polls as csv
2017-10-03 16:50:59 +02:00
5cf86bf74a
Update UI in poll and remove old code
2017-10-03 14:11:11 +02:00
09c0a473e2
fix function signatures
2017-10-03 14:08:40 +02:00
3337689630
Wrong translation key in toolbar
2017-10-03 14:04:07 +02:00
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
2017-10-03 12:10:16 +03:00
126742a1c3
Fix bugs in sframe poll and update UI
2017-10-02 19:02:31 +02:00
351b95d6a9
resolve merge conflicts
2017-10-02 18:59:47 +02:00
6c7b135f91
lint compliance
2017-10-02 18:58:18 +02:00
94c392b79f
secure messaging
2017-10-02 18:57:17 +02:00
53f65f6a87
Merge branch 'staging' into framework
2017-10-02 17:46:27 +03:00
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
1e5bc5da14
onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer
2017-10-02 15:09:25 +03:00
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
2017-10-02 15:06:01 +03:00
12e82e80ec
When changing the title of a presentation, the title in the bottom of the slide should also change
2017-10-02 15:04:44 +03:00
0a99478d9f
catch diffdom errors and plow through
2017-09-28 11:50:35 +02:00
0f9e93e1de
make tests pass again
2017-09-28 10:36:40 +02:00
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-28 10:23:59 +02:00
19e58cec94
prevent typeError
2017-09-28 10:23:48 +02:00
66da349ee4
Sandboxed Poll app with less2
2017-09-27 18:52:04 +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
9b2251005c
Merge branch 'staging' into newpoll
2017-09-27 10:36:33 +02:00
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
2c10f9b07b
Merge branch 'staging' into newpoll
2017-09-27 10:32:03 +02:00
e02a779c14
Use secure drive as default drive
2017-09-27 10:31:35 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
c1275b5671
Prepare secure poll
2017-09-27 10:28:10 +02:00
4c394e0031
Fix UI issue in poll
2017-09-27 10:15:23 +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
9571b3c018
persist whiteboard content across sessions
2017-09-26 15:16:17 +02:00
748172585e
update for modified id
2017-09-26 15:00:25 +02:00
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 14:35:02 +02:00
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
52be5501d6
remove invalid test
2017-09-26 14:34:54 +02:00
69014e5fde
Fix mediatags in pad not cached
2017-09-26 11:21:36 +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
59ad96e491
Make sure the user is redirected to the drive at registration
2017-09-25 16:11:50 +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
1afbd4648d
Fix old drive
2017-09-25 15:23:42 +02:00
b871faffc9
Enable tags in code and slide
2017-09-25 14:47:31 +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
deba699d08
Remove old style for sframe drive
2017-09-25 11:54:01 +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
db4c3e7e2c
Merge branch 'master' into staging
2017-09-20 12:07:01 +02:00
b5b84f540e
fix preview mode class
2017-09-20 12:02:46 +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
95542bcdaf
Lint
2017-09-19 15:38:19 +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
72f0952835
Make sure we can't open a pad using the wrong app
2017-09-19 11:31:45 +02:00
35a313d6ee
Make palette realtime
2017-09-19 11:20:20 +02:00
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
3023e8c855
Fix templates in whiteboard
2017-09-19 11:04:52 +02:00
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 10:27:30 +02:00
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
a78b597ebb
lint errors
2017-09-18 15:51:47 +02:00
8ce364a252
Add a button to empty the trash in the drive
2017-09-18 15:47:39 +02:00
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
f9d27d2783
WIP secure contacts
2017-09-18 15:09:01 +02:00
483160a96a
Fix tab notifications in code and slides
2017-09-18 14:31:58 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
0a656ca8d6
Fix the splitter in code and add it back
2017-09-18 12:09:18 +02:00
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
c00d295466
Add missing translations
2017-09-15 17:33:36 +02:00
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-15 13:21:45 +02:00
974658453c
Mediatag integration in pads
2017-09-15 13:21:37 +02:00
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
15db6b180c
copy bug fixes from changes
2017-09-14 13:43:13 +02:00
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
4f6909fce3
set icon to 'faded' styles
2017-09-14 12:07:21 +02:00
086d4bae32
clean up contacts initialization
2017-09-14 12:01:57 +02:00
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:54:16 +02:00
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:52:52 +02:00
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
a8f7beb20b
remove deprecated apps
2017-09-14 11:36:40 +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
c50c297490
Fix the size of the loading screen for the filepicker
2017-09-14 11:03:39 +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
5f0383ae99
update version of sframe-boot because it was changed
2017-09-14 10:52:25 +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
fa64adbbe5
Hide visible elements while loading the slide app
2017-09-13 17:22:43 +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
8a87ec180e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:52:26 +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
dc86579d46
use an 8 character password for tests
2017-09-13 14:00:48 +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
5ac3e97dc8
Merge branch 'master' into staging
2017-09-12 12:20:47 +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
5b3667fd4e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 11:29:57 +02:00
63700cb791
Fix an issue when cleaning the template category in the drive
2017-09-12 11:29:24 +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
0f9da69185
Show if a pad has been renamed in the drive
2017-09-12 11:17:52 +02:00
499b5ea2ba
warn that a password is too short before doing anything else
2017-09-12 10:50:59 +02:00
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 17:52:40 +02:00
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
2017-09-11 17:52:34 +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
9271b0c1a8
Try to fix half-codemirror bug
2017-09-11 14:42:43 +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
8ef27dca08
Lint
2017-09-11 12:25:23 +02:00
1aef844fc3
Fix title attribute for truncated titles in the drive
2017-09-11 12:23:24 +02:00
55fe882f64
Fix readonly mode in code
2017-09-11 12:23:04 +02:00
bd422178c4
Hide the filepicker button in readonly mode
2017-09-11 11:59:09 +02:00
51f1be9f7a
Improve the input style when renaming a folder in the drive tree
2017-09-11 11:50:04 +02:00
642511dc3b
Disable exiting present mode when in embed mode
2017-09-11 11:38:40 +02:00
403b62f131
Fix ghost icon modal and improve UI on mobile
2017-09-11 11:04:14 +02:00
757d0a2800
Save the state of CKEditor's toolbar (visible or hidden)
2017-09-11 10:10:29 +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
a302ee5d25
guard against undefined arguments
2017-09-08 17:39:41 +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
de5d925154
autoselect user href in settings
2017-09-08 15:07:25 +02:00
e950ce74cb
focus on input when opening filepicker
2017-09-08 15:01:47 +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
1ae7076790
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
2017-09-07 22:08:34 +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
1958bca984
restore hashing screen in login and register
2017-09-07 16:48:22 +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
8b2733e2da
Fix typo
2017-09-06 11:37:19 +02:00
c713b44a4a
Merge branch 'soon'
2017-09-06 11:13:10 +02:00
d98bbf7df9
Fix the pad app when cryptpad is in an iframe
2017-09-06 11:03:20 +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
47ec959032
make sure contenteditable is not set in read only mode
2017-09-05 18:35:11 +02:00
6a735b441f
use paul's print styles
2017-09-05 18:16:06 +02:00
e7de9229a8
Do not print toolbar and collaboration ( #178 ).
...
paul
2017-09-05 17:29:03 +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
31a6881dba
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 15:40:02 +02:00
305feebbbe
Fix scroll position when refreshing the drive tree
2017-09-05 15:39:49 +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
904936209a
Remove loading tips in the file picker
2017-09-05 11:59:42 +02:00
98cd69e53e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 11:57:54 +02:00
204e45dfae
Enable templates in pad
2017-09-05 11:57:44 +02:00
4108520d20
Add contacts in the new menu if the user is logged in
2017-09-05 11:43:16 +02:00
38e1ed93e4
Merge branch 'code2' into staging
2017-09-05 11:42:00 +02:00
acaf45a0e0
drop thumbnails if metadata is too large
2017-09-05 11:38:49 +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
d42d988d36
make test more resilient
2017-09-05 11:26:41 +02:00
cd7b00d45b
make pixels 100px
2017-09-05 11:25:47 +02:00
e8ac5ed87f
add a test for thumbnails
2017-09-05 11:24:30 +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
c0f14dea5e
Store code2 and set the title at the first visit
2017-09-04 17:09:45 +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
a164115e8c
Add media-tag-nacl to cryptpad so it will be hosted on the server
2017-09-01 10:10:34 +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
9a23b77b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-30 11:31:59 +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
4db4f66786
Remove an unnecessary fix for Safari
2017-08-30 11:14:58 +02:00
a2ed266048
Move the code app in a secure iframe
2017-08-30 11:10:57 +02:00
1044531806
Fix Safari iframe size issue
2017-08-30 11:04:52 +02:00
a34d1793e0
drop 'loading' text from loading screen
2017-08-29 18:15:40 +02:00
595fa4c2e4
Merge branch 'soon'
2017-08-29 12:00:16 +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
40f062abda
restore app usage report in new pad
2017-08-29 10:50:02 +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
288c03bb41
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 17:52:01 +02:00
fe03e6ae83
bad code, lint
2017-08-28 17:53:23 +02:00
430a6f7b77
lint compliance
2017-08-28 17:51:50 +02:00
190dff1c9b
Use the bounce app for opening a link with the right click
2017-08-28 17:50:55 +02:00
dec870d2bd
Fix selection in the drive search results
2017-08-28 17:43:26 +02:00
4bceef8952
Fix the upload status table missing in the drive
2017-08-28 17:35:24 +02:00
0b4e044540
Fix the plugin to open a link in a new tab in pad
2017-08-28 17:26:51 +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
e4a356d873
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 12:25:12 +02:00
056285a7b6
Move pad2 to pad and create bounce app
2017-08-28 12:25:05 +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
5fbbaee2f5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 11:48:02 +02:00
6314487d98
handle unfriends in ui
2017-08-28 11:47:54 +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
e62faf7c7b
Edge fix, always use async iframe onLoad rather than invoking it manually
2017-08-28 11:22:57 +02:00
54eefd3d94
replace contacts with contacts2
2017-08-25 16:07:53 +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
a99eb9365e
correctly set indentation preferences when changing languages
2017-08-24 17:31:04 +02:00
f58d4c941f
clean up a bit
2017-08-24 17:19:57 +02:00
ea5f47f0f9
remove some TODOs and solve some wee bugs
2017-08-24 17:18:59 +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
443d8a8941
remove unnecessary files
2017-08-24 11:29:42 +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
dc283c2d74
Load 1, load 2... not load 1, load 3.
2017-08-23 15:49:51 +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
d6c33fdf4f
Ghost icon to add a pad
2017-08-22 17:33:48 +02:00
89a13d4b21
work on contacts2 until feature parity is reached
2017-08-22 15:55:49 +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
98daf10ed1
Ability to collapse the root directory in the drive
2017-08-22 14:54:41 +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
20a68ad71c
Hide the template button if the pad2 is a template
2017-08-21 18:31:15 +02:00
aa9e0d3cd3
Enable AppConfig in pad2
2017-08-21 18:30:51 +02:00
4089803785
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:22:08 +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
bffa4d01a8
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:08:46 +02:00
b081603455
Update requirejs
2017-08-21 18:08:37 +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
1da11a1883
Disable edition in readonly mode in pad2
2017-08-21 15:30:48 +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
5e22e1dc59
use CryptPad instead of Cryptpad in titles
2017-08-17 20:47:39 +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
4e62f79594
stop referring to deleted file as background image
2017-08-17 17:31:18 +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
52d344c3d1
Merge branch 'soon'
2017-08-17 12:53:04 +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
5b7d1cccd7
fix display and logic for tab setting checkbox
2017-08-16 15:32:42 +02:00
3315449114
Lets try this...
2017-08-16 14:30:17 +02:00
4c949a61e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:40:34 +02:00
6b174934c8
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
2017-08-16 12:40:15 +02:00
e7ef1e1c2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:35:13 +02:00
7c49ca6e3f
Fix initial text size in code
2017-08-16 12:34:56 +02:00
2874ccb5dc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:15:20 +02:00
2a8abc2699
comment out splitter code
2017-08-16 12:15:08 +02:00
725e19925c
Yeah, that was silly...
2017-08-16 12:11:25 +02:00
b0b1ed037c
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
2017-08-16 10:19:24 +02:00
130b330ede
refactor messaging
2017-08-16 10:04:50 +02:00
638a94785f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-14 16:24:17 +02:00
7ca60e55a7
Lock the pad's inner-iframe down with CSP
2017-08-14 16:23:38 +02:00
5e6e76dfc1
make regex case insensitive
2017-08-14 14:41:23 +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
007db0b080
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 17:28:42 +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
66cacf08da
allow users to write with tabs instead of spaces
2017-08-11 15:21:26 +02:00
64849507b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 14:26:34 +02:00
a5f9b49bfb
make poll box bigger so it show text in smaller windows
2017-08-11 13:09:34 +02:00
82fadde249
restyle info-box in drive
2017-08-11 13:04:03 +02:00
958294f109
put code settings in their own tab
2017-08-11 13:00:50 +02:00
c8d7675ede
remove z-index on splitter in code
2017-08-11 12:56:42 +02:00
17b986a6ca
fix toolbar drive link (oops)
2017-08-11 12:56:06 +02:00
ae0b2ca1a8
add label for code indentation
2017-08-11 12:55:10 +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
fbb880f277
implement customizable indentation widths
2017-08-10 18:06:47 +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
9dce40f3af
only add the splitter once
2017-08-10 14:34:48 +02:00
4026994310
make splitter work when scrolling
2017-08-10 14:25:31 +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
c036bb26be
use proper bootstrap class
2017-08-09 15:46:17 +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
b34e252eda
improve whiteboard styles
2017-08-09 14:43:32 +02:00
844967a880
continued refactoring
2017-08-09 14:20:37 +02:00
8b2cb37c2f
improve poll looks
2017-08-09 12:33:40 +02:00
5821d3e72f
remove useless title
2017-08-09 11:25:58 +02:00
a4aeada585
make the file dialog placeholder visible, center file list
2017-08-09 11:20:46 +02:00
d47e26efd5
add margin in code
2017-08-09 11:17:14 +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
2cc6c636db
Add some missing titles
2017-08-08 16:20:31 +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
85e383d5c5
add invisible splitter
2017-08-08 14:36:04 +02:00
90075cd48e
media-tag to less file
2017-08-08 12:01:39 +02:00
d15280c6ce
prevent pdfs from being huge
2017-08-08 11:52:16 +02:00
c427f375dd
add bootstrap css to /code for image uploader
2017-08-08 11:48:17 +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
798a3dc520
automatically fill in display name in poll
2017-08-07 12:19:21 +02:00
0588564bc9
overflow on poll div
2017-08-07 11:49:10 +02:00
be29236af1
fix pdfjs styles
2017-08-07 10:47:30 +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
dd6a057962
add 'msg' class for pierre
2017-08-04 15:45:30 +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
fb13e656b7
get new messages when reconnecting
2017-08-03 15:06:06 +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
aba4e34e7f
reuse inline styles as a mixin
2017-08-03 12:17:33 +02:00
195cb01d72
better styles for messaging input
2017-08-03 12:15:06 +02:00
1fac0b9bc4
make todo text bold
2017-08-03 11:53:48 +02:00
66d81429bd
integrate file embed into code editor
2017-08-03 11:47:54 +02:00
dc7db074e8
open pad links when clicking in readOnly mode
2017-08-03 11:04:38 +02:00
71d88b156d
make empty profiles for users on first visit
2017-08-02 17:32:09 +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
1c238100c8
don't throw alerts in the middle of someone's presentation
2017-07-31 15:07:34 +02:00
7cd42d5ff1
use provided clearTooltips function
2017-07-31 14:52:33 +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
9734a4db80
append new items to the top of the todo
2017-07-26 15:37:16 +02:00
69eaccbdef
don't create empty todo entries
2017-07-26 15:22:25 +02:00
e84edb2c2b
disable problematic tooltips
2017-07-26 13:46:07 +02:00
9c07793d0d
remove tips on checkbox state change
2017-07-26 13:42:12 +02:00
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:29:33 +02:00
8e83501c72
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:31:02 +02:00
459e0b3b16
CSS and bug fixes for todo
2017-07-26 13:30:39 +02:00
d4ffa7903f
better popup logic
2017-07-26 13:26:35 +02:00
0b81781f35
make the input bold
2017-07-26 13:25:58 +02:00
2af96d74fc
automatically focus on the create todo form
2017-07-26 13:17:02 +02:00
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:07:41 +02:00
3da76e3ae8
Update style for the todo app
2017-07-26 13:07:35 +02:00
85366f2368
use new translations
2017-07-26 13:04:23 +02:00
d99d071716
WIP checkbox titles
2017-07-26 13:03:48 +02:00
e6031c2209
slightly better styles
2017-07-26 13:03:25 +02:00
8cfd8d3270
add translations for todo
2017-07-26 13:02:14 +02:00
c390bdd518
resolve merge conflicts
2017-07-26 12:41:13 +02:00
0612a50ab4
Add fadein/fadeout when adding or removing a task
2017-07-26 11:40:24 +02:00
082632048b
fix styles for very wide todos
2017-07-26 11:06:17 +02:00
a15ff9ba2a
hide dates in todo
2017-07-26 11:05:54 +02:00
f0581f2cf4
also style the whole box
2017-07-26 10:43:37 +02:00
d7d7f212bb
add classes to style fake checkboxes based on checkstate
2017-07-26 10:21:32 +02:00
304d37a334
use styled checkboxes
2017-07-26 10:06:24 +02:00
b5603c89f0
add checkboxes to todos
2017-07-26 09:37:02 +02:00
796bf89491
Update of the front-page
2017-07-24 17:56:54 +03:00
4f63921fc9
better width styling on list. lint compliance
2017-07-24 16:36:53 +02:00
35635c3e2f
CSS fix for the todo app
2017-07-24 16:27:35 +02:00
3efb9d21f5
pull in bootstrap. submit form on enter
2017-07-24 16:22:12 +02:00
83f79a3883
slightly better styles
2017-07-24 16:14:49 +02:00
180e643af9
Style of Todo App
2017-07-24 16:29:39 +03:00
5083299e8a
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
2017-07-24 16:23:59 +03:00
f67fb32bf1
Add, delete, display a task in Todo
2017-07-24 16:23:53 +03:00
56514d7e17
add val api
2017-07-24 15:10:15 +02:00
ac718b6dfa
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
2017-07-24 15:35:45 +03:00
a61faebb2b
App Todo - Init and HTML
2017-07-24 15:35:29 +03:00
522476a2a6
initialize data model and provide basic methods
2017-07-24 14:30:43 +02:00
4345fc0662
Todo app
2017-07-24 14:13:47 +02:00
e3b9c03fc0
TodoApp - Init
2017-07-23 16:28:49 +03:00
658b00814b
TodoApp - Style and translations
2017-07-23 16:08:49 +03:00
a9a65e4ca9
remove unused code
2017-07-23 14:36:41 +02:00
4b53e02f6c
oups
2017-07-23 14:32:13 +02:00
2e3be27278
resolve merge
2017-07-23 14:31:13 +02:00
dcf5719eaf
handle most of the boilerplate stuff
2017-07-23 14:27:47 +02:00
0d43a84c2b
move example into another folder
2017-07-23 14:19:43 +02:00
5c07eac4de
Change title and footer
2017-07-23 15:08:27 +03:00
f5454f232a
pull in todomvc vanillajs example
2017-07-23 13:46:41 +02: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
3bd5f01e53
Fix slide ratio in preview mode
2017-07-20 09:55:18 +02:00
140964478e
Enter + shift key to add a new line in chat
2017-07-20 09:54:44 +02:00
331b4dddea
Clean debugging code
2017-07-19 17:50:08 +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
88813aee02
Show that only html can be imported in pads
2017-07-19 16:36: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
1dc98dcff1
CSS for the contacts input field
2017-07-19 10:30:38 +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
221a3b4fed
Fix duplicate leftside entries when disconnected in profile
2017-07-18 12:10:58 +02:00
22a28a8fd9
Fix undefined description in profile
2017-07-18 11:49:54 +02:00
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
2017-07-18 10:57:37 +02:00
7540f12040
Fix profile creation button not centered
2017-07-18 10:45:36 +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
3545a66320
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:51:40 +02:00
743b87b70f
Add initial text in /contacts
2017-07-17 18:51:23 +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
0cd94e2ba8
add title to contacts app
2017-07-17 17:38:41 +02:00
f2320190b8
change friends url to /contacts/
2017-07-17 17:18:28 +02:00
756b561bbc
lint compliance
2017-07-17 14:12:51 +02:00
6306de5265
set avatar border-radius to 4px
2017-07-17 13:43:51 +02:00
c452f25414
stub invite app
2017-07-17 11:56:34 +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
9ef45fe9f1
add background-color to names in chat
2017-07-13 18:04:56 +02:00
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
0340b45f2c
migrate profile to include edKey. don't propose connecting to users with whom you are already friends
2017-07-13 17:45:13 +02:00
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
7be1e249e1
add fa-share-alt to pad initialText
2017-07-13 15:48:03 +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
7a225af11e
fix some minor slide navigation bugs
2017-07-13 10:57:27 +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
8fb5762eea
Lint errors
2017-07-12 18:51:19 +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
d09f5b70c7
Fix slides CSS
2017-07-11 17:39:26 +02:00
159ccc2866
Fix mediatag flickering
2017-07-11 17:39:08 +02:00
ce50dbf3ca
Hide the 'templates' list header if the category is empty
2017-07-11 15:51:55 +02:00
42075e4b5f
Make everything 16px and 32px
2017-07-11 15:34:46 +02:00
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
5d5f936682
Hide the upload table in code
2017-07-11 14:38:26 +02:00
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
e732284845
Lint
2017-07-11 12:50:16 +02:00
112c4c85e5
Left menu in drive
2017-07-11 12:47:15 +02:00
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
2017-07-11 11:56:06 +02:00
9f9e593e0f
Lint
2017-07-10 18:46:59 +02:00
560671ae7d
Make avatars circle
2017-07-10 18:46:26 +02:00
125018c8c3
New settings page
2017-07-10 18:29:23 +02:00
c02fa39524
Make drive search bar blue
2017-07-10 15:19:08 +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
086e5909dd
Merge branch 'soon' into staging
2017-07-10 10:43:41 +02:00
781974ec7c
center 'Create a profile' button
2017-07-10 10:42:39 +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
29c6ed6e9b
hide slide arrows when there are no more slides in that direction
2017-07-10 09:51:15 +02:00
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-10 09:30:44 +02:00
eff27ff6c5
focus username button
2017-07-10 09:24:46 +02:00
c60a71e210
add connect button and view profile button
2017-07-10 09:23:58 +02:00
94f8e4b8a3
use validateKeys when instantiating object
2017-07-10 09:21:58 +02:00
22fbc7e5d8
implement getter for public keys
2017-07-10 09:21:27 +02:00
ecef970250
float connect button right because flex styles messed up the pencil icon
2017-07-10 08:57:09 +02:00
df103c4074
Messaging app
2017-07-07 18:53:21 +02:00
f9a43d6570
select everything before file extensions in drive when renaming
2017-07-07 10:37:12 +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
f02285d103
fix lowercased p
2017-07-06 10:49:33 +02:00
5d96c68ad7
fix profile app display on chrome
2017-07-06 10:43:14 +02:00
de420de021
Fix the folder's path in the search results page
2017-07-06 10:40:21 +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
3e802c2443
Fix overflowing content in profile
2017-07-05 10:14:43 +02:00
dfad622b76
Merge branch 'soon' into staging
2017-07-05 10:14:30 +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
fa06f9d413
fix minor bugs in poll
2017-07-04 15:09:09 +02:00
90bcadd87b
Merge branch 'soon' into staging
2017-07-04 14:58:45 +02:00
be7e7fec43
don't bypass warnings when registering
2017-07-04 14:56:07 +02:00
cab595f959
Fix duplicate folders in the drive
2017-07-04 14:51:35 +02:00
42375190e6
style buttons for long titles
2017-07-04 14:24:07 +02:00
c27c140130
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-04 12:37:50 +02:00
ac8da0d52d
load codemirror in the correct context. fix selection events
2017-07-04 12:37:24 +02:00
789274fd4f
Fix font-size in slides
2017-07-04 12:32:14 +02:00
7377d39b39
hide print button
2017-07-04 10:35:55 +02:00
43b877ad27
fix styling on media tag download button
2017-07-04 10:28:50 +02:00
1fd0ba488a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-04 10:21:35 +02:00
04a28433ae
replace inner content of media tag download buttons
2017-07-04 10:21:29 +02:00
f85af7ef4c
hide useless messages
2017-07-04 10:19:18 +02:00
a59853f9c2
use new media tag
2017-07-04 10:15:45 +02:00
8cf694bea6
Lint
2017-07-03 18:41:41 +02:00
47c6c64b8a
Allow emojis in default avatars
2017-07-03 18:37:50 +02:00
ffd184d50e
Fix overflowing names in the new userlist
2017-07-03 17:41:34 +02:00
92d88d1644
don't change allowed media types until we have media-tag scoping
2017-07-03 16:45:40 +02:00
678986dac4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 16:43:57 +02:00
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
efedfe0667
show preview pane by default in /slide/
2017-07-03 14:53:50 +02:00
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 14:43:17 +02:00
1df5e6e855
Fix toolbar buttons for Safari
2017-07-03 14:32:54 +02:00
8b0210baf1
hide useless error
2017-07-03 12:26:34 +02:00
991cb896bd
Fix avatar in /pad
2017-07-03 12:25:05 +02:00
70c9f3df75
Fix avatar size
2017-07-03 12:13:37 +02:00
f09ae9b19c
jshint compliance
2017-07-03 11:51:47 +02:00
4a9a564913
don't try to handle error thta never happens anymore
2017-07-03 11:40:52 +02:00
b15aa3360a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 11:39:21 +02:00
6ac056e314
make explicit file size RPCs unauthenticated
2017-07-03 11:38:39 +02:00
9b131dc49c
Fix CSS in the slide app
2017-07-03 11:34:30 +02:00
5694505719
Fix syntax highlighting
2017-07-03 11:16:28 +02:00
335898a4c7
Hack the drawer to close it when clicking outside
2017-06-30 18:23:23 +02:00
472a62730b
Fix profile creation and add a link to the profile app
2017-06-30 17:24:22 +02:00
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 16:57:37 +02:00
b153dda6ff
Add avatars in the user list
2017-06-30 16:57:23 +02:00
c2e153e8ed
more fouc fixes
2017-06-30 16:20:10 +02:00
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:36:34 +02:00
568ce70afd
Add a spinner for the history and update history buttons
2017-06-30 12:36:21 +02:00
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:11:55 +02:00
c25f2df721
Added caching versions to some of the images which are loaded by js
2017-06-30 12:11:44 +02:00
4ab82710ab
Remove the background color from the text-color button in the slide app
2017-06-30 11:55:29 +02:00
7e69d051c4
Lint errors
2017-06-30 11:46:20 +02:00
26193aeaa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 11:42:59 +02:00
b9320e6005
Toolbar improvements
2017-06-30 11:42:54 +02:00
9e91739044
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 11:21:27 +02:00
ecff05425f
feedback for slide printing
2017-06-30 11:21:19 +02:00
75c2a1fd73
jshint compliance
2017-06-30 11:20:56 +02:00
b8934c0b97
smarter redraws of drive/settings usage bar
2017-06-30 11:20:40 +02:00
5a3e9c785c
Fix ckeditor toolbar
2017-06-29 18:15:41 +02:00
cc5b7615ad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 18:05:49 +02:00
ed0121d172
Lint errors
2017-06-29 18:05:34 +02:00
8abc94d37b
Replace folder images in the drive
2017-06-29 18:03:19 +02:00
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 17:54:29 +02:00
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
b037cfbfdb
set usage tips relative to bottom of screen, not top
2017-06-29 17:25:06 +02:00
1763cf72d1
tell anonymous users they can't upload
2017-06-29 16:28:58 +02:00
7a87775372
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:21:09 +02:00
45f180955b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:20:46 +02:00
56a25e1036
Small fixes for the new toolbar
2017-06-29 15:15:40 +02:00
1179992a90
update feedback key name
2017-06-29 14:48:33 +02:00
4a5f5de78c
restore missing stylesheet for poll
2017-06-29 14:35:23 +02:00
bbf9916a91
fixes for file app
2017-06-29 14:21:48 +02:00
39149a052b
add new feedback keys
2017-06-29 14:16:20 +02:00
7a5c5ce0a3
load scripts asynchronously
2017-06-29 12:17:08 +02:00
9b8866ed72
handle RPC_NOT_READY error for logged out users
2017-06-29 11:13:48 +02:00
a9f8f42e3c
use minified less compiler
2017-06-29 10:50:21 +02:00
fca1ef4d36
hide unstyled content until the loading screen is displayed
2017-06-29 10:49:35 +02:00
877c5a8d0e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 17:15:42 +02:00
19ff8a345d
Avatar upload in the profile app
2017-06-28 16:59:35 +02:00
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
7a7307d560
fix logging when resetting
2017-06-28 12:08:16 +02:00
6c94605b9b
File upload in the profile
2017-06-28 10:59:29 +02:00
7439bbaba2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 10:58:24 +02:00
ed45814020
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 10:57:49 +02:00
cfc5907237
remove unnecessary style rules
2017-06-28 10:41:08 +02:00
85d8eda847
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 18:58:26 +02:00
176e47f394
Add the profile app
2017-06-27 18:58:20 +02:00
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 18:26:10 +02:00
7de2683169
make all apps use clientside templates
2017-06-27 18:17:52 +02:00
f232675cc9
create a favicon if it does not already exist
2017-06-27 18:07:03 +02:00
3be6433fdf
send feedback on name changes
2017-06-27 18:06:32 +02:00
bdca6b10c2
use templates in poll.js
2017-06-27 15:38:12 +02:00
bb74935b08
allow pin limit caching to occur at api level
2017-06-27 15:37:42 +02:00
00a554ca0d
Fix the donate button style with the new toolbar
2017-06-27 14:36:49 +02:00
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
67a096a8a4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 09:57:32 +02:00
7b37146034
don't let spacebar keyups propagate outside of the title
2017-06-26 18:32:29 +02:00
9195c0cd12
is isOverPinLimit in toolbar
2017-06-26 18:13:06 +02:00
fce0a37f50
cache pin data once retrieved from the server
2017-06-26 17:32:31 +02:00
8f2db44793
Remove getTitle from the file app
2017-06-26 16:38:59 +02:00
33ea8cb183
Make sure we don't call both the yes and no handlers in prompts
2017-06-26 16:23:55 +02:00
3076ade23a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-26 15:16:45 +02:00
36ef4178dc
Remove the editable title from the file app
2017-06-26 15:16:17 +02:00
51e06e68a7
don't change slides when navigating through history
2017-06-26 14:40:48 +02:00
ffcbde4325
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-26 14:32:42 +02:00
48ece55ed5
style fixes, and dynamic less compilation
2017-06-26 14:32:37 +02:00
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
2017-06-26 14:08:14 +02:00
ce44a8d351
Fix the backup button in anonymous drive
2017-06-23 18:02:36 +02:00
06a0590f73
New folder icons
2017-06-23 17:58:41 +02:00
cc341ca6d4
Lint error
2017-06-23 17:57:29 +02:00
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
b4b851959f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 17:42:32 +02:00
61a891267f
more feedback
2017-06-22 17:42:24 +02:00
c1d2fa6b52
Unhack validateKey for the history mode
2017-06-22 17:35:54 +02:00
90cc3e6a5e
New userlist in the whiteboard app
2017-06-22 17:16:42 +02:00
2710279904
Use the new share button in the file app
2017-06-22 17:03:51 +02:00
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 16:15:08 +02:00
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
35bfa1dce4
test client-side templates in whiteboard app
2017-06-22 16:01:33 +02:00
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
852c028822
don't allow editing if pad type is wrong
2017-06-22 14:31:55 +02:00
92b6e60573
Small improvements for the new toolbar
2017-06-22 11:13:53 +02:00
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 11:12:51 +02:00
115813c191
Merge branch 'new-templates' into staging
2017-06-22 11:11:32 +02:00
3657e978fd
give main2.js a more sensible name
2017-06-22 11:06:11 +02:00
118b83c420
make register and login user clientside templates
2017-06-22 10:04:46 +02:00
ab54dcf84d
make libs pass jshint
2017-06-22 10:03:58 +02:00
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
48f9745619
clientside templating
2017-06-21 18:02:38 +02:00
503e9de07c
Lint errors
2017-06-20 18:00:57 +02:00
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
3052ec8abb
Merge branch 'newCk' into staging
2017-06-20 14:57:19 +02:00
c3f636851a
Fix path size width in drive
2017-06-20 14:56:15 +02:00
c22f610d5c
Fix the drive integrity check
2017-06-20 12:59:44 +02:00
fb388f2610
Fix an issue with invalid drive before migration
2017-06-20 12:42:30 +02:00
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
728272d936
Fix undefined function
2017-06-20 10:29:03 +02:00
f13d23241c
Upgrade CkEditor to version 4.7
2017-06-20 10:03:13 +02:00
d822dfe37a
add forget button to file app
2017-06-19 17:44:30 +02:00
7fd36a72f3
re-add download button for file app
2017-06-19 17:36:22 +02:00
f02a381e32
avoid horizontal scrollbars
2017-06-19 16:30:03 +02:00
cc5d5d4f1d
make pdfs in file app big
2017-06-19 16:13:11 +02:00
dbfad9d227
Lint
2017-06-19 16:02:27 +02:00
91d46cdee4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 15:58:26 +02:00
d3b9ac2511
Update the preview and present content on Ready in slides
2017-06-19 15:58:10 +02:00
5fd4870b8b
Merge pull request #138 from pbondoer/staging
...
Fix poll auto-focus inputs
2017-06-19 15:36:35 +02:00
626e54d7b5
Fix poll auto-focus inputs
2017-06-19 15:30:22 +02:00
54adb680e7
Hide the slide number in the title outside of present mode
2017-06-19 15:26:27 +02:00
17838f1d70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 14:55:45 +02:00
1b66383bac
don't create color-picker if readonly
2017-06-19 14:55:34 +02:00
a38819f5b9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 14:41:38 +02:00
1ad1b78c64
Fix the history mode with readOnly and old URLs
2017-06-19 14:41:31 +02:00
b2a70f86d3
disallow concurrent logins
2017-06-19 14:22:21 +02:00
35e0de463b
disallow concurrent scrypt cycles
2017-06-19 14:18:10 +02:00
06ca70d11e
lint compliance
2017-06-19 14:05:40 +02:00
f29f430e7c
better handling of non-rpc messages
2017-06-19 12:38:24 +02:00
f1aef66fc9
Fix the drive history
2017-06-19 12:35:45 +02:00
008c417111
Context menu was not hidden after a click in the drive
2017-06-19 12:08:53 +02:00
377a90961b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 11:53:13 +02:00
e40f43bd20
Migrated pads were not displayed instantly in the drive
2017-06-19 11:52:57 +02:00
44b8bc7b7d
make context menus unselectable
2017-06-19 11:43:24 +02:00
928dadcf77
Fix toolbar dropdown menus not visible in slide
2017-06-19 10:37:01 +02:00
1df11f2813
Update the font-size when entering/leaving present mode
2017-06-19 10:26:14 +02:00
66d8c0ed11
Add a preview mode to the slide app
2017-06-16 15:11:32 +02:00
a5924cb803
Make sure the initial title is set in the userDoc when creating a new pad
2017-06-15 18:50:39 +02:00
8b5f4dbd47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 18:36:35 +02:00
3a36040ba7
lint
2017-06-15 18:36:23 +02:00
0e9ebddf11
fix the things
2017-06-15 18:13:24 +02:00
c0e2c1060e
don't reload when slide hash changes
2017-06-15 17:54:35 +02:00
24c14ffbf3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 16:31:09 +02:00
5bfd8470cb
Display the file size before downloading it
2017-06-15 16:30:50 +02:00
3f85471ab3
update footer and package.json for upcoming version
2017-06-15 16:13:33 +02:00
594405de73
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 15:36:23 +02:00
cbe21959b4
Update UI for the file/media app
2017-06-15 15:35:52 +02:00
06eceed8b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 15:34:22 +02:00
17146d7af9
send feedback for uploads
2017-06-15 15:34:13 +02:00
c2c04bd5d8
Lint
2017-06-15 15:02:31 +02:00
2068a8b85b
Embed the mediatag library in the file app
2017-06-15 14:58:18 +02:00
cd5705b3f3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 13:54:09 +02:00
1e9bc89855
Fix drive icons when the name contains a long word
2017-06-15 13:54:02 +02:00
5ce453afa0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 13:51:11 +02:00
e73e32ab3a
fix too-tall download button
2017-06-15 13:43:32 +02:00
927f6404b8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 13:35:07 +02:00
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
c2e5ef7048
better sizing for videos
2017-06-15 12:11:39 +02:00
c717d01714
fix pdf height
2017-06-15 12:06:53 +02:00
b480346f5b
more efficient media-tag
2017-06-15 12:05:25 +02:00
0d47e68d3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 11:19:24 +02:00
0eb50b8b6c
drop pdf.js dependency
2017-06-15 11:19:06 +02:00
f3f1cf9e6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 11:05:07 +02:00
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
20874c76f1
prevent code blocks from overflowing slides
2017-06-14 18:56:44 +02:00
a4f45caebb
Lint
2017-06-14 18:25:54 +02:00
0a4e876139
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 17:52:23 +02:00
8738b42861
Update the drive UI to show that Upload and New are linked to a folder
2017-06-14 17:51:48 +02:00
d25a0893cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 17:24:49 +02:00
3184e5d235
don't reload page on hash mode change
2017-06-14 17:24:44 +02:00
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
295f9c00a6
send feedback on buttons
2017-06-14 15:36:46 +02:00
d5c7eb49a4
send feedback on toolbar hide and CKE buttons
2017-06-14 15:33:12 +02:00
7e0a2abc2c
Fix the file name when restoring an element from the trash
2017-06-14 13:03:10 +02:00
5b523be171
Fix drag&drop for pads in the drive
2017-06-14 12:55:46 +02:00
e51f678bb9
Don't display the popup whne moving a file to the trash
2017-06-14 12:50:44 +02:00
497ddeee6d
Upload files with drag&drop in the drive
2017-06-14 12:47:37 +02:00
687b4d8307
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 11:10:26 +02:00
69c3bd392f
update built media tag to latest XWiki version
2017-06-14 11:09:51 +02:00
494b44e2b1
fix lint errors
2017-06-14 10:04:54 +02:00
d8ebe566d8
Don't call mediatag for non-image files
2017-06-13 18:38:53 +02:00
37d3d04f0e
Clean mediatag integration code
2017-06-13 17:57:27 +02:00
802146e2af
don't put download buttons in a div
2017-06-13 17:54:15 +02:00
19cb920a7c
Don't redraw a media-tag everytime the content has changed
2017-06-13 17:21:22 +02:00
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
17e4e9be27
download anything that isn't an image in media-tag
2017-06-13 16:12:13 +02:00
8a599eb9b1
Merge pull request #136 from blumeva/staging
...
change minimum opacity
2017-06-13 15:27:45 +02:00
fc9ecb0f7c
change minimum opacity
2017-06-13 15:20:16 +02:00
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
2017-06-13 14:32:46 +02:00
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
2017-06-13 14:23:41 +02:00
74c9b663dd
changing whiteboard
2017-06-13 14:14:36 +02:00
40cf7ea107
change whiteboard
2017-06-13 14:11:22 +02:00
1b574da053
fix typo
2017-06-13 12:24:32 +02:00
7ad89bd9af
don't interrupt boot because of localStorage failure
2017-06-13 12:02:36 +02:00
3337e2133a
more thorough tests for localStorage presence
2017-06-13 11:57:21 +02:00
a57f8679c5
Fix a race condition in the file app
2017-06-13 11:45:37 +02:00
4eeea93265
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:38:16 +02:00
11e2226f1a
Fix lint errors
2017-06-13 11:38:04 +02:00
c779e328e8
warn users if their browser does not support localStorage
2017-06-13 11:33:25 +02:00
d7292e69c6
Fix undefined variable
2017-06-13 11:25:12 +02:00
d367f71760
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:24:57 +02:00
c70eb73d52
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:24:20 +02:00
803bad1421
Move the file upload code in a separate file
2017-06-13 11:21:26 +02:00
d344f03778
proper button text
2017-06-12 18:57:07 +02:00
2b5339193c
bring admin back
2017-06-12 18:45:04 +02:00
b2eef94232
use numbers, not strings
2017-06-12 18:35:13 +02:00
848010842f
dont sanity check silently
2017-06-12 18:26:27 +02:00
56f2c46c75
document a line
2017-06-12 18:25:06 +02:00
cd1c957929
NaN safety
2017-06-12 18:23:17 +02:00
0118fdbd00
use a local variable
2017-06-12 18:16:11 +02:00
49370764c1
change whiteboard translation
2017-06-12 18:14:33 +02:00
b8e394db67
poll: Implement multiple choices
2017-06-12 18:01:51 +02:00
a58162a617
Make the drive tests work when not logged in
2017-06-12 17:49:33 +02:00
c702313489
change label texte
2017-06-12 17:34:45 +02:00
2fb5e3ae35
Merge branch 'staging' into newToolbar
2017-06-12 17:00:07 +02:00
969cec5d60
Make sure everything is synced before migrating the drive
2017-06-12 16:19:45 +02:00
7dd9ed543a
Merge branch 'newDrive' into staging
2017-06-12 16:08:09 +02:00
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
9c5bade83e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 14:37:29 +02:00
d1f4617419
Fix a race condition causing the preview part to be empty
2017-06-12 14:37:12 +02:00
c9725af508
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 14:34:01 +02:00
db9b9547d9
don't complain about missing callbacks for messages which are not our responsibility
2017-06-12 14:33:50 +02:00
685b352db8
poll: Add show help button
2017-06-12 14:25:10 +02:00
30bdb9881c
Fix undefined element in select dropdown menus
2017-06-12 14:23:06 +02:00
298e34a9de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 12:47:47 +02:00
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
5d565660a9
tiny fixes
2017-06-12 12:41:03 +02:00
6bc191725f
poll: support disconnect and fix trash button
2017-06-12 12:37:07 +02:00
b3221c0fb4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 12:32:48 +02:00
0c957989d2
add link to upload table when complete
2017-06-12 12:31:52 +02:00
5d6a0dcc1b
Fix width transition when dragging preview
2017-06-12 12:27:24 +02:00
6dd80c26b1
Make editing more visible
2017-06-12 12:00:39 +02:00
3ff3eac283
Fix a race condition causing the drive to be empty
2017-06-12 11:54:20 +02:00
a5cb5f2ceb
Merge branch 'staging' into newDrive
2017-06-12 10:51:38 +02:00
1b671edce9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 10:50:30 +02:00
9a4a6e9b40
Always display the upgrade button in the drive
2017-06-12 10:17:52 +02:00
9cc25d4c9f
Merge branch 'staging' into newDrive
2017-06-09 17:03:01 +02:00
7134b00544
Add a button to display the context menu for the trash on mobiles
2017-06-09 17:02:50 +02:00
d24458e4b0
Fix the tests to work with the async migration
2017-06-09 16:41:51 +02:00
a57f7c6ce7
Fix lint errors
2017-06-09 16:39:44 +02:00
4bcad3e154
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-09 16:26:36 +02:00
47857ec382
use cached pinned usage data
2017-06-09 16:17:20 +02:00
75c3c10b20
Merge branch 'soon' into staging
2017-06-09 15:56:45 +02:00
c1402fbb0a
Lint error
2017-06-09 15:56:18 +02:00
b36484931d
Lint
2017-06-09 15:55:46 +02:00
1fb638f519
clean the code
2017-06-09 15:50:13 +02:00
9d758a040b
Fix an issue with the search field not displayed properly
2017-06-09 15:45:46 +02:00
08902c0910
drop extraneous argument
2017-06-09 15:33:28 +02:00
ansuz