Commit graph

461 commits

Author SHA1 Message Date
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
yflory
81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 14:43:17 +02:00
ansuz
8b0210baf1 hide useless error 2017-07-03 12:26:34 +02:00
yflory
991cb896bd Fix avatar in /pad 2017-07-03 12:25:05 +02:00
ansuz
6ac056e314 make explicit file size RPCs unauthenticated 2017-07-03 11:38:39 +02:00
yflory
472a62730b Fix profile creation and add a link to the profile app 2017-06-30 17:24:22 +02:00
yflory
b153dda6ff Add avatars in the user list 2017-06-30 16:57:23 +02:00
yflory
568ce70afd Add a spinner for the history and update history buttons 2017-06-30 12:36:21 +02:00
yflory
7e69d051c4 Lint errors 2017-06-30 11:46:20 +02:00
yflory
26193aeaa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 11:42:59 +02:00
yflory
b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
ansuz
75c2a1fd73 jshint compliance 2017-06-30 11:20:56 +02:00
ansuz
b8934c0b97 smarter redraws of drive/settings usage bar 2017-06-30 11:20:40 +02:00
yflory
ed0121d172 Lint errors 2017-06-29 18:05:34 +02:00
yflory
7a87775372 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:21:09 +02:00
yflory
56a25e1036 Small fixes for the new toolbar 2017-06-29 15:15:40 +02:00
ansuz
39149a052b add new feedback keys 2017-06-29 14:16:20 +02:00
ansuz
9b8866ed72 handle RPC_NOT_READY error for logged out users 2017-06-29 11:13:48 +02:00
yflory
877c5a8d0e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 17:15:42 +02:00
yflory
19ff8a345d Avatar upload in the profile app 2017-06-28 16:59:35 +02:00
ansuz
7a7307d560 fix logging when resetting 2017-06-28 12:08:16 +02:00
yflory
6c94605b9b File upload in the profile 2017-06-28 10:59:29 +02:00
yflory
00a554ca0d Fix the donate button style with the new toolbar 2017-06-27 14:36:49 +02:00
ansuz
67a096a8a4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 09:57:32 +02:00
ansuz
fce0a37f50 cache pin data once retrieved from the server 2017-06-26 17:32:31 +02:00
yflory
33ea8cb183 Make sure we don't call both the yes and no handlers in prompts 2017-06-26 16:23:55 +02:00
yflory
0d4d104e08 Mobile support for the new toolbar 2017-06-23 17:56:14 +02:00
ansuz
b4b851959f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 17:42:32 +02:00
ansuz
61a891267f more feedback 2017-06-22 17:42:24 +02:00
yflory
684269fdda Userlist in polls 2017-06-22 16:14:54 +02:00
yflory
a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 15:52:31 +02:00
yflory
13288ee18b Update the userlist in code, slide and pad 2017-06-22 15:52:25 +02:00
ansuz
852c028822 don't allow editing if pad type is wrong 2017-06-22 14:31:55 +02:00
yflory
92b6e60573 Small improvements for the new toolbar 2017-06-22 11:13:53 +02:00
yflory
8d956c3de6 New toolbar 2017-06-21 18:04:35 +02:00
yflory
728272d936 Fix undefined function 2017-06-20 10:29:03 +02:00
ansuz
c0e2c1060e don't reload when slide hash changes 2017-06-15 17:54:35 +02:00
ansuz
17146d7af9 send feedback for uploads 2017-06-15 15:34:13 +02:00
yflory
66b076111e Add an upload button to the slide's file picker 2017-06-15 12:32:44 +02:00
yflory
a237eec41e Add a file picker in the slide app 2017-06-15 11:04:58 +02:00
ansuz
d25a0893cf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 17:24:49 +02:00
ansuz
3184e5d235 don't reload page on hash mode change 2017-06-14 17:24:44 +02:00
yflory
1077b3b267 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-14 15:55:10 +02:00
ansuz
295f9c00a6 send feedback on buttons 2017-06-14 15:36:46 +02:00
yflory
497ddeee6d Upload files with drag&drop in the drive 2017-06-14 12:47:37 +02:00
yflory
f9c26645cf Upload images using the slide app 2017-06-13 16:15:04 +02:00
yflory
803bad1421 Move the file upload code in a separate file 2017-06-13 11:21:26 +02:00
yflory
7dd9ed543a Merge branch 'newDrive' into staging 2017-06-12 16:08:09 +02:00
yflory
30bdb9881c Fix undefined element in select dropdown menus 2017-06-12 14:23:06 +02:00
yflory
a5cb5f2ceb Merge branch 'staging' into newDrive 2017-06-12 10:51:38 +02:00
yflory
b36484931d Lint 2017-06-09 15:55:46 +02:00
ansuz
23318357a6 make fewer RPC calls for usageBar 2017-06-09 15:33:03 +02:00
ansuz
df586a223c update limits, usage, plan, and note whenever they are checked 2017-06-09 15:31:43 +02:00
yflory
78e6118153 Merge branch 'staging' into newDrive 2017-06-09 14:38:21 +02:00
ansuz
c4e5741ae0 update upgrade button logic 2017-06-09 12:12:39 +02:00
ansuz
f1a9002417 use upgradeURL with usage bar 2017-06-09 10:46:11 +02:00
yflory
b0fe04381d Merge branch 'staging' into newDrive 2017-06-08 18:14:31 +02:00
yflory
1c2ea04f11 Drive refactoring 2017-06-08 17:52:00 +02:00
yflory
ac91d2f413 Fix the upgrade and donate buttons in the home page 2017-06-06 11:37:54 +02:00
yflory
ee57458158 Remove the pin limit alert 2017-06-06 10:49:32 +02:00
ansuz
7b94106bac fix inverted conditional :/ 2017-05-31 18:15:31 +02:00
ansuz
2e03485db4 remove known bad entries from localStorage.userHash... 2017-05-31 18:12:58 +02:00
ansuz
936bf8df9d return falsey if userHash is junk 2017-05-31 18:08:41 +02:00