Commit graph

523 commits

Author SHA1 Message Date
yflory
729c013af7 Get mediatag embed code from the file app 2017-09-05 15:08:05 +02:00
yflory
78b338c379 Merge branch 'code2' into staging 2017-09-05 11:38:17 +02:00
yflory
d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
yflory
86e23ac19f Use less2 in secure iframes 2017-09-04 15:09:54 +02:00
yflory
f12f4bb925 Integrate filepicker secure iframe in the code2 app 2017-09-01 15:17:14 +02:00
ansuz
72ef730f23 implement tag-related functions 2017-08-31 18:06:26 +02:00
ansuz
0302c06d0e send feedback if client does not support symbols 2017-08-31 18:04:20 +02:00
yflory
89b7b644f3 Enable drag & upload in code2 and prepare filepicker 2017-08-31 16:32:26 +02:00
yflory
0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory
0ce32464fd Fix flickering avatar in firefox 2017-08-30 12:26:11 +02:00
yflory
a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
ansuz
181a19a9a0 polyfill for array.fill 2017-08-29 11:49:10 +02:00
yflory
88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory
d9bf2abcd8 Fix old hashes not working anymore in pad 2017-08-28 13:53:24 +02:00
yflory
d4589c4699 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 12:22:38 +02:00
yflory
6c65e5ff72 Fix the ghost icon in the drive and add missing text 2017-08-28 12:22:31 +02:00
ansuz
5c2b58e703 log error synchronously so we get a trace when pinPads has no callback 2017-08-28 11:47:01 +02:00
ansuz
91f6e3e543 remove a lot of dead code 2017-08-28 11:28:45 +02:00
ansuz
57d0c6c973 Merge branch 'new-messaging' into staging 2017-08-25 14:42:34 +02:00
ansuz
b71f1860db make uid function reusable 2017-08-24 11:31:20 +02:00
yflory
ec64ac485d Fix 'not a function' error 2017-08-23 11:06:55 +02:00
Caleb James DeLisle
acfaaa7d56 jshint compliance 2017-08-23 11:04:44 +02:00
Caleb James DeLisle
2ad9fcee17 Manual merge of notify.js 2017-08-23 10:45:55 +02:00
yflory
c33b128bf4 Enable feedback in pad2 2017-08-22 18:18:58 +02:00
yflory
f40d2c0b20 Add templates to pad2 2017-08-21 18:21:53 +02:00
yflory
e2d39de143 Forget button in pad2 2017-08-21 15:20:38 +02:00
yflory
e4020ba8d4 Fix pad creation in pad2 2017-08-21 14:41:56 +02:00
yflory
140c6f3776 Add limit warning in pad2 2017-08-21 12:24:33 +02:00
yflory
30aef71603 Enable avatars in pad2 2017-08-21 12:01:38 +02:00
yflory
90f892de9c Useradmin menu, notifications and share button in pad2 2017-08-18 16:34:41 +02:00
yflory
f5855a2870 Add account name in metadata manager 2017-08-17 16:25:25 +02:00
ansuz
290763d6c5 don't complain about bad realtime state just because you disconnected 2017-08-17 15:07:34 +02:00
ansuz
ee874878dd clear tooltips when the userlist is redrawn 2017-08-17 12:50:40 +02:00
ansuz
284124a32d WIP 2017-08-11 10:59:54 +02:00
ansuz
844967a880 continued refactoring 2017-08-09 14:20:37 +02:00
ansuz
58b3b32cc3 big messaging refactor. split UI from logic 2017-08-08 17:13:10 +02:00
Pierre Bondoerffer
8f285eba9f
make file picker ui even prettier 2017-08-07 17:22:54 +02:00
Pierre Bondoerffer
c53e738054
improve file picker ui 2017-08-07 16:27:29 +02:00
ansuz
05aa5ed347 hide new feature until it is finished 2017-08-04 18:07:47 +02:00
ansuz
9865359bb0 don't tell users about new versions 2017-08-04 14:05:00 +02:00
ansuz
e786117110 get new messages when reconnecting and WIP get more history 2017-08-03 15:04:29 +02:00
ansuz
2ce341fed6 disable input field when disconnected 2017-08-03 14:12:07 +02:00
ansuz
8b0831ac5d save images drawn with whiteboard to your CryptDrive 2017-08-02 16:51:41 +02:00
ansuz
311f709dc4 lint compliance 2017-07-31 17:15:17 +02:00
ansuz
542d0cd17f drop support for legacy pad list 2017-07-31 15:34:56 +02:00
ansuz
3fa010027c implement clearTooltips 2017-07-31 12:29:41 +02:00
ansuz
ae693ff5a7 lint compliance 2017-07-23 09:01:12 +02:00
ansuz
6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-22 14:15:15 +02:00
ansuz
55cb0734e2 make bad state timeout configurable 2017-07-22 10:56:39 +02:00
yflory
a80b00a765 Move the file picker in common 2017-07-20 18:32:03 +02:00
yflory
b9bba76b4e Make the delay for tooltips configurable 2017-07-20 17:08:11 +02:00
yflory
c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory
82c87144cb Remove the friend request button when the request is sent 2017-07-19 14:14:34 +02:00
ansuz
c3ba7cd792 fix race condition 2017-07-13 12:55:08 +02:00
ansuz
d0d38aa2a3 feedback on first visit 2017-07-13 11:03:56 +02:00
ansuz
575d4612f9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 18:56:12 +02:00
ansuz
eda9908c3b prevent accessing attributes of null 2017-07-12 18:56:04 +02:00
ansuz
eeb2ee2d17 add clear channel rpc 2017-07-12 18:55:29 +02:00
yflory
ac684a8dc7 Use the APP toolbar in profile 2017-07-12 18:34:16 +02:00
ansuz
0483d15b8f lint compliance 2017-07-12 10:55:42 +02:00
ansuz
c0cb5c4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 10:46:15 +02:00
ansuz
5b3cca58bd modifications to handle latest media-tag 2017-07-12 10:44:03 +02:00
yflory
a0b14faf89 Fix the font in settings and drive 2017-07-11 13:11:16 +02:00
yflory
e6188bfb63 Fix useradmin dropdown position 2017-07-10 12:38:54 +02:00
yflory
97d8d86395 Fix avatar in static pages 2017-07-10 12:03:44 +02:00
yflory
159d72f33b Merge branch 'msg' into staging 2017-07-10 11:48:22 +02:00
yflory
8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:46:16 +02:00
yflory
ff10c282d4 Avatar in the user admin button 2017-07-10 11:46:06 +02:00
yflory
be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:16:52 +02:00
yflory
f0523a0153 Avatar in the user admin menu 2017-07-10 11:16:44 +02:00
ansuz
e10de1219b feedback on view hash usage 2017-07-10 11:13:56 +02:00
ansuz
52eb8e307c feedback for language used 2017-07-10 10:59:32 +02:00
yflory
1c531ccd47 Pin the chat channels 2017-07-10 10:39:57 +02:00
ansuz
4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 2017-07-10 10:34:25 +02:00
ansuz
c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-10 09:30:44 +02:00
ansuz
22fbc7e5d8 implement getter for public keys 2017-07-10 09:21:27 +02:00
yflory
df103c4074 Messaging app 2017-07-07 18:53:21 +02:00
ansuz
1c462d5c4a use random token for feedback instead of date 2017-07-07 10:16:54 +02:00
yflory
5c7441f82c Display the friend list in the friend app 2017-07-06 18:38:58 +02:00
yflory
a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
yflory
852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 14:27:32 +02:00
yflory
5b5a7ab286 Hide the friend button when the resquest is accepted 2017-07-06 12:31:31 +02:00
ansuz
bce0b03ba4 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 10:25:53 +02:00
ansuz
d293ba4d44 add support for invite hashes 2017-07-06 09:44:39 +02:00
yflory
37d5b0afb9 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-05 18:42:51 +02:00
yflory
95e2efab89 Add to friend list 2017-07-05 18:42:32 +02:00
ansuz
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
yflory
bf17ad3f1e Friend button in the userlist 2017-07-05 15:59:36 +02:00
yflory
8dc8aa27ab Lint 2017-07-05 12:27:40 +02:00
yflory
35e8c1a63b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-05 12:27:08 +02:00
yflory
43ac71603c Move pad attributes in pad data 2017-07-05 12:26:42 +02:00
ansuz
9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
ansuz
3fe0baa956 disable pin limit caching 2017-07-04 15:50:52 +02:00
ansuz
9c1eaf9c1a lint compliance 2017-07-04 15:48:20 +02:00
ansuz
43b877ad27 fix styling on media tag download button 2017-07-04 10:28:50 +02:00
ansuz
1fd0ba488a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 10:21:35 +02:00
ansuz
04a28433ae replace inner content of media tag download buttons 2017-07-04 10:21:29 +02:00
yflory
8cf694bea6 Lint 2017-07-03 18:41:41 +02:00
yflory
47c6c64b8a Allow emojis in default avatars 2017-07-03 18:37:50 +02:00
ansuz
92d88d1644 don't change allowed media types until we have media-tag scoping 2017-07-03 16:45:40 +02:00