Commit graph

2279 commits

Author SHA1 Message Date
yflory
125018c8c3 New settings page 2017-07-10 18:29:23 +02:00
yflory
c02fa39524 Make drive search bar blue 2017-07-10 15:19:08 +02:00
yflory
438e7e6cf9 Fix display name in useradmin (friends app) 2017-07-10 13:04:33 +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
e8f3df5a46 Clean less 2017-07-10 11:57:04 +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
ansuz
086e5909dd Merge branch 'soon' into staging 2017-07-10 10:43:41 +02:00
ansuz
781974ec7c center 'Create a profile' button 2017-07-10 10:42:39 +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
29c6ed6e9b hide slide arrows when there are no more slides in that direction 2017-07-10 09:51:15 +02:00
ansuz
c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-10 09:30:44 +02:00
ansuz
eff27ff6c5 focus username button 2017-07-10 09:24:46 +02:00
ansuz
c60a71e210 add connect button and view profile button 2017-07-10 09:23:58 +02:00
ansuz
94f8e4b8a3 use validateKeys when instantiating object 2017-07-10 09:21:58 +02:00
ansuz
22fbc7e5d8 implement getter for public keys 2017-07-10 09:21:27 +02:00
ansuz
ecef970250 float connect button right because flex styles messed up the pencil icon 2017-07-10 08:57:09 +02:00
yflory
df103c4074 Messaging app 2017-07-07 18:53:21 +02:00
ansuz
f9a43d6570 select everything before file extensions in drive when renaming 2017-07-07 10:37:12 +02:00
ansuz
1c462d5c4a use random token for feedback instead of date 2017-07-07 10:16:54 +02:00
yflory
21f1527c71 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:39:06 +02:00
yflory
5c7441f82c Display the friend list in the friend app 2017-07-06 18:38:58 +02:00
ansuz
fac715dd09 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:35:21 +02:00
ansuz
4b23ef74d7 add support for curve message signing and curve validateKeys 2017-07-06 18:30:16 +02:00
yflory
a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
yflory
af31771e3a Share a channel id, not a hash 2017-07-06 14:47:02 +02:00
yflory
852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 14:27:32 +02:00
yflory
26a83003b5 Create an owned channel 2017-07-06 14:27:13 +02:00
yflory
5b5a7ab286 Hide the friend button when the resquest is accepted 2017-07-06 12:31:31 +02:00
ansuz
f02285d103 fix lowercased p 2017-07-06 10:49:33 +02:00
ansuz
5d96c68ad7 fix profile app display on chrome 2017-07-06 10:43:14 +02:00
yflory
de420de021 Fix the folder's path in the search results page 2017-07-06 10:40:21 +02:00
ansuz
d3bbdc27c0 lint compliance 2017-07-06 10:33: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
909e00bbc3 create a listmap object using public key crypto 2017-07-06 10:25:43 +02:00
yflory
96fde4e5ed Add missing file 2017-07-06 10:24:28 +02:00
ansuz
df53166b37 implement and use prototype curve encryptors 2017-07-06 10:22:20 +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
ansuz
4016a95540 prototype invite app 2017-07-05 16:01:50 +02:00
yflory
465ef74f2b Fix rpc 2017-07-05 16:02:22 +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
yflory
3e802c2443 Fix overflowing content in profile 2017-07-05 10:14:43 +02:00
ansuz
dfad622b76 Merge branch 'soon' into staging 2017-07-05 10:14:30 +02:00
yflory
69f4ce2abd Fix middle click on the drive button 2017-07-04 17:03:54 +02:00
ansuz
cbd9fc4076 Merge branch 'staging' 2017-07-04 17:03:20 +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
fa06f9d413 fix minor bugs in poll 2017-07-04 15:09:09 +02:00
ansuz
90bcadd87b Merge branch 'soon' into staging 2017-07-04 14:58:45 +02:00
ansuz
be7e7fec43 don't bypass warnings when registering 2017-07-04 14:56:07 +02:00
yflory
cab595f959 Fix duplicate folders in the drive 2017-07-04 14:51:35 +02:00
ansuz
42375190e6 style buttons for long titles 2017-07-04 14:24:07 +02:00
ansuz
c27c140130 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 12:37:50 +02:00
ansuz
ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
yflory
789274fd4f Fix font-size in slides 2017-07-04 12:32:14 +02:00
ansuz
7377d39b39 hide print button 2017-07-04 10:35:55 +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
ansuz
f85af7ef4c hide useless messages 2017-07-04 10:19:18 +02:00
ansuz
a59853f9c2 use new media tag 2017-07-04 10:15:45 +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
yflory
ffd184d50e Fix overflowing names in the new userlist 2017-07-03 17:41:34 +02:00
ansuz
92d88d1644 don't change allowed media types until we have media-tag scoping 2017-07-03 16:45:40 +02:00
ansuz
678986dac4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 16:43:57 +02:00
yflory
fa2d857d70 Fix css issues with Safari 2017-07-03 16:11:41 +02:00
ansuz
efedfe0667 show preview pane by default in /slide/ 2017-07-03 14:53:50 +02:00
yflory
81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 14:43:17 +02:00
yflory
1df5e6e855 Fix toolbar buttons for Safari 2017-07-03 14:32:54 +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
yflory
70c9f3df75 Fix avatar size 2017-07-03 12:13:37 +02:00
ansuz
f09ae9b19c jshint compliance 2017-07-03 11:51:47 +02:00
ansuz
4a9a564913 don't try to handle error thta never happens anymore 2017-07-03 11:40:52 +02:00
ansuz
b15aa3360a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 11:39:21 +02:00
ansuz
6ac056e314 make explicit file size RPCs unauthenticated 2017-07-03 11:38:39 +02:00
yflory
9b131dc49c Fix CSS in the slide app 2017-07-03 11:34:30 +02:00
yflory
5694505719 Fix syntax highlighting 2017-07-03 11:16:28 +02:00
yflory
335898a4c7 Hack the drawer to close it when clicking outside 2017-06-30 18:23:23 +02:00
yflory
472a62730b Fix profile creation and add a link to the profile app 2017-06-30 17:24:22 +02:00
yflory
f357ec32c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 16:57:37 +02:00
yflory
b153dda6ff Add avatars in the user list 2017-06-30 16:57:23 +02:00
ansuz
c2e153e8ed more fouc fixes 2017-06-30 16:20:10 +02:00
yflory
555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:36:34 +02:00
yflory
568ce70afd Add a spinner for the history and update history buttons 2017-06-30 12:36:21 +02:00
Caleb James DeLisle
2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:11:55 +02:00
Caleb James DeLisle
c25f2df721 Added caching versions to some of the images which are loaded by js 2017-06-30 12:11:44 +02:00
yflory
4ab82710ab Remove the background color from the text-color button in the slide app 2017-06-30 11:55:29 +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
9e91739044 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 11:21:27 +02:00
ansuz
ecff05425f feedback for slide printing 2017-06-30 11:21:19 +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
5a3e9c785c Fix ckeditor toolbar 2017-06-29 18:15:41 +02:00
yflory
cc5b7615ad Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 18:05:49 +02:00
yflory
ed0121d172 Lint errors 2017-06-29 18:05:34 +02:00
yflory
8abc94d37b Replace folder images in the drive 2017-06-29 18:03:19 +02:00
ansuz
b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 17:54:29 +02:00
yflory
8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 2017-06-29 17:51:30 +02:00
ansuz
b037cfbfdb set usage tips relative to bottom of screen, not top 2017-06-29 17:25:06 +02:00
ansuz
1763cf72d1 tell anonymous users they can't upload 2017-06-29 16:28:58 +02:00
yflory
7a87775372 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:21:09 +02:00
ansuz
45f180955b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:20:46 +02:00
yflory
56a25e1036 Small fixes for the new toolbar 2017-06-29 15:15:40 +02:00
ansuz
1179992a90 update feedback key name 2017-06-29 14:48:33 +02:00
ansuz
4a5f5de78c restore missing stylesheet for poll 2017-06-29 14:35:23 +02:00
ansuz
bbf9916a91 fixes for file app 2017-06-29 14:21:48 +02:00
ansuz
39149a052b add new feedback keys 2017-06-29 14:16:20 +02:00
ansuz
7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz
9b8866ed72 handle RPC_NOT_READY error for logged out users 2017-06-29 11:13:48 +02:00
ansuz
a9f8f42e3c use minified less compiler 2017-06-29 10:50:21 +02:00
ansuz
fca1ef4d36 hide unstyled content until the loading screen is displayed 2017-06-29 10:49:35 +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
5e56ad912e remove the last bit of compiled css 2017-06-28 14:51:49 +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
ansuz
7439bbaba2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 10:58:24 +02:00
ansuz
ed45814020 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 10:57:49 +02:00
ansuz
cfc5907237 remove unnecessary style rules 2017-06-28 10:41:08 +02:00
yflory
85d8eda847 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 18:58:26 +02:00
yflory
176e47f394 Add the profile app 2017-06-27 18:58:20 +02:00
ansuz
1c1869a22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 18:26:10 +02:00
ansuz
7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00
ansuz
f232675cc9 create a favicon if it does not already exist 2017-06-27 18:07:03 +02:00
ansuz
3be6433fdf send feedback on name changes 2017-06-27 18:06:32 +02:00
ansuz
bdca6b10c2 use templates in poll.js 2017-06-27 15:38:12 +02:00
ansuz
bb74935b08 allow pin limit caching to occur at api level 2017-06-27 15:37:42 +02:00
yflory
00a554ca0d Fix the donate button style with the new toolbar 2017-06-27 14:36:49 +02:00
ansuz
e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00
ansuz
67a096a8a4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 09:57:32 +02:00
ansuz
7b37146034 don't let spacebar keyups propagate outside of the title 2017-06-26 18:32:29 +02:00
ansuz
9195c0cd12 is isOverPinLimit in toolbar 2017-06-26 18:13:06 +02:00
ansuz
fce0a37f50 cache pin data once retrieved from the server 2017-06-26 17:32:31 +02:00
yflory
8f2db44793 Remove getTitle from the file app 2017-06-26 16:38:59 +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
3076ade23a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-26 15:16:45 +02:00
yflory
36ef4178dc Remove the editable title from the file app 2017-06-26 15:16:17 +02:00
ansuz
51e06e68a7 don't change slides when navigating through history 2017-06-26 14:40:48 +02:00
ansuz
ffcbde4325 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-26 14:32:42 +02:00
ansuz
48ece55ed5 style fixes, and dynamic less compilation 2017-06-26 14:32:37 +02:00
yflory
38f568635d Fix duplicate media-tag in slides when adding or removing a slide 2017-06-26 14:08:14 +02:00
yflory
ce44a8d351 Fix the backup button in anonymous drive 2017-06-23 18:02:36 +02:00
yflory
06a0590f73 New folder icons 2017-06-23 17:58:41 +02:00
yflory
cc341ca6d4 Lint error 2017-06-23 17:57:29 +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
c1d2fa6b52 Unhack validateKey for the history mode 2017-06-22 17:35:54 +02:00
yflory
90cc3e6a5e New userlist in the whiteboard app 2017-06-22 17:16:42 +02:00
yflory
2710279904 Use the new share button in the file app 2017-06-22 17:03:51 +02:00
yflory
5a48cba999 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 16:15:08 +02:00
yflory
684269fdda Userlist in polls 2017-06-22 16:14:54 +02:00
ansuz
35bfa1dce4 test client-side templates in whiteboard app 2017-06-22 16:01:33 +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
ansuz
eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 11:12:51 +02:00
ansuz
115813c191 Merge branch 'new-templates' into staging 2017-06-22 11:11:32 +02:00
ansuz
3657e978fd give main2.js a more sensible name 2017-06-22 11:06:11 +02:00
ansuz
118b83c420 make register and login user clientside templates 2017-06-22 10:04:46 +02:00
ansuz
ab54dcf84d make libs pass jshint 2017-06-22 10:03:58 +02:00
yflory
8d956c3de6 New toolbar 2017-06-21 18:04:35 +02:00
ansuz
48f9745619 clientside templating 2017-06-21 18:02:38 +02:00
yflory
503e9de07c Lint errors 2017-06-20 18:00:57 +02:00
yflory
b7a0547b77 New toolbar colors 2017-06-20 17:59:11 +02:00
yflory
3052ec8abb Merge branch 'newCk' into staging 2017-06-20 14:57:19 +02:00
yflory
c3f636851a Fix path size width in drive 2017-06-20 14:56:15 +02:00
yflory
c22f610d5c Fix the drive integrity check 2017-06-20 12:59:44 +02:00
yflory
fb388f2610 Fix an issue with invalid drive before migration 2017-06-20 12:42:30 +02:00
yflory
59fb5bd8be One toolbar color per app 2017-06-20 12:33:50 +02:00
yflory
5a248db267 Merge branch 'staging' into newCk 2017-06-20 10:57:40 +02:00
yflory
728272d936 Fix undefined function 2017-06-20 10:29:03 +02:00
yflory
f13d23241c Upgrade CkEditor to version 4.7 2017-06-20 10:03:13 +02:00
ansuz
d822dfe37a add forget button to file app 2017-06-19 17:44:30 +02:00
ansuz
7fd36a72f3 re-add download button for file app 2017-06-19 17:36:22 +02:00
ansuz
f02a381e32 avoid horizontal scrollbars 2017-06-19 16:30:03 +02:00
ansuz
cc5d5d4f1d make pdfs in file app big 2017-06-19 16:13:11 +02:00
yflory
dbfad9d227 Lint 2017-06-19 16:02:27 +02:00
yflory
91d46cdee4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 15:58:26 +02:00
yflory
d3b9ac2511 Update the preview and present content on Ready in slides 2017-06-19 15:58:10 +02:00
ansuz
5fd4870b8b Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
2017-06-19 15:36:35 +02:00