Commit graph

992 commits

Author SHA1 Message Date
ansuz
89e5830409 make alertify display time configurable 2016-12-28 17:13:00 +01:00
ansuz
49d80d91d9 don't load customize/pad.js anymore 2016-12-28 15:53:27 +01:00
ansuz
f020fd5a75 remove /customize/pad.js from main apps 2016-12-28 15:12:22 +01:00
ansuz
aae443c8e9 replace old poll app with new 2016-12-28 11:44:48 +01:00
ansuz
387f4ebf5d add this important js file I forgot 2016-12-28 11:01:14 +01:00
ansuz
8f0de589dc add missing cp class to more html 2016-12-28 10:45:14 +01:00
ansuz
e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
ansuz
8b034a9554 better flow and animations for login page 2016-12-27 12:32:20 +01:00
ansuz
db12b5e896 move text for login page into translation file 2016-12-27 12:31:16 +01:00
ansuz
5e1d8292c5 guard against trying to parse special fragments 2016-12-26 14:23:17 +01:00
ansuz
51067430f9 more restructuring of user app 2016-12-26 14:19:29 +01:00
ansuz
a4ed2388e2 use 'box' class 2016-12-26 14:19:02 +01:00
ansuz
eb620bee77 restructure user application 2016-12-26 14:17:39 +01:00
yflory
a10eac2773 Fix lint errors 2016-12-22 18:16:38 +01:00
ansuz
52a593c2c2 fix jshint complaints 2016-12-22 17:27:56 +01:00
ansuz
53a4d4738a really make sure you're logged out 2016-12-22 17:22:32 +01:00
ansuz
63cd5c16ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 17:20:30 +01:00
yflory
81259fc25f Refresh unsorted and templates when files data changes 2016-12-22 17:20:05 +01:00
ansuz
5534da8abf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 16:54:51 +01:00
yflory
9b6c9e3891 Add support for templates in the file manager 2016-12-22 16:53:38 +01:00
ansuz
acfc27f5c5 fix merge conflicts 2016-12-22 16:53:03 +01:00
ansuz
3197b62fbb latest work 2016-12-22 16:44:49 +01:00
ansuz
29d406b7a9 implement cryptput 2016-12-22 16:00:13 +01:00
ansuz
84d5e4b35d better tools for playing with template code 2016-12-22 11:03:44 +01:00
yflory
1772cc93c8 Fix the taildoc bug 2016-12-22 11:02:12 +01:00
yflory
87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
ansuz
86cda4357b handle more possible cases 2016-12-21 18:24:48 +01:00
ansuz
1682d23c1c remove old user prototype 2016-12-21 18:06:05 +01:00
yflory
046220f239 Add info boxes for the different categories 2016-12-21 11:46:49 +01:00
yflory
403ba53980 Fix typo error 2016-12-21 10:22:48 +01:00
yflory
e9418af88b Add an info box in the file manager 2016-12-20 18:59:50 +01:00
yflory
c359c27997 Use user object as default store in file manager 2016-12-20 17:27:45 +01:00
yflory
4aed585574 Fix style issues in the toolbar 2016-12-20 14:40:00 +01:00
yflory
f9db7e588e Fix unused backup in localStorage 2016-12-20 14:37:29 +01:00
yflory
c7e63f63fd Use the user object in file manager if it exists 2016-12-20 11:30:04 +01:00
ansuz
6778a7062d Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging 2016-12-20 11:23:54 +01:00
ansuz
bd6992da0a create a random hash 2016-12-20 11:13:15 +01:00
ansuz
2cd50498c2 add log(in|out) functions to common 2016-12-20 11:11:40 +01:00
ansuz
dfea802c77 better crypto hygeine, start thinking more about ui 2016-12-20 11:09:41 +01:00
yflory
e3f484d876 File manager in the home page, lint 2016-12-19 17:53:03 +01:00
ansuz
7df460c766 implement createChannelId api 2016-12-19 14:55:39 +01:00
ansuz
3698fe8b0e Merge branch 'soon' into login 2016-12-19 12:51:57 +01:00
ansuz
5a14db9f07 Merge branch 'test-filemanager' into login 2016-12-19 12:37:28 +01:00
ansuz
dd46b9425a Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-19 12:37:02 +01:00
yflory
4646d5c866 Add suport for read-only mode in the file manager 2016-12-19 12:35:13 +01:00
ansuz
2a624a0b60 add example usage for cryptget.js 2016-12-19 12:25:36 +01:00
ansuz
303953a431 Merge branch 'soon' into login 2016-12-19 11:04:46 +01:00
ansuz
6b9529b121 implement ajax-like functionality for zk docs 2016-12-19 10:59:18 +01:00
yflory
5bc7766f44 Use a consistent toolbar across all apps 2016-12-16 18:35:49 +01:00
ansuz
8a7fda6341 Merge branch 'soon' into login 2016-12-16 18:10:35 +01:00
ansuz
a220742f68 fix reversed color settings 2016-12-16 15:31:22 +01:00
ansuz
308db7fa79 fix uncolored /pad/ content in IE 2016-12-16 15:25:06 +01:00
ansuz
67baf30d65 basic outline of logins 2016-12-16 15:19:17 +01:00
ansuz
2968488278 convert uint8 arrays to hex 2016-12-16 15:18:06 +01:00
yflory
d95a3ac92e Fix an issue when deleting a key from the proxy 2016-12-16 11:41:45 +01:00
yflory
82f3d5f852 Open the file manager of someone else 2016-12-13 18:59:04 +01:00
ansuz
c0d96fb10d Merge branch 'login' into test-filemanager 2016-12-13 11:21:18 +01:00
yflory
c3e3aa69c3 Merge branch 'fileManager' into fmIndex 2016-12-12 18:27:19 +01:00
ansuz
5d335ba796 Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:25:07 +01:00
yflory
8e6830d080 Fix file manager with a chosen hash 2016-12-12 18:24:45 +01:00
yflory
2b077a8e95 add the file manager in the main page 2016-12-12 18:03:06 +01:00
ansuz
f36d15d0db Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:03:00 +01:00
yflory
b7f2ef97c7 Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager 2016-12-12 12:05:31 +01:00
yflory
fdb5c2ddb5 Fix UI issues with rename and delete actions 2016-12-12 12:03:54 +01:00
yflory
319ce5d8c8 Fix the code app 2016-12-12 10:35:28 +01:00
yflory
ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory
43ccd11adc Merge branch 'infiniteSpinner' into fileManagerMerge 2016-12-08 16:03:18 +01:00
yflory
05fd6c1563 Fix the infinite spinner problem 2016-12-08 16:01:46 +01:00
yflory
5cd7d8ec84 Fix undefined userid in new poll 2016-12-08 10:19:23 +01:00
yflory
cb43eb9ca1 Merge branch 'newpoll' into fileManagerMerge 2016-12-07 16:59:43 +01:00
yflory
9b3719e0ae Merge branch 'soon' into fileManagerMerge 2016-12-07 16:59:32 +01:00
yflory
b7b4a034a3 Merge branch 'soon' into newpoll 2016-12-07 16:58:28 +01:00
yflory
ddc99cecb1 Fix lint errors 2016-12-07 12:22:27 +01:00
yflory
f26cdb1a21 Fix UI issues, unclickable user column, add confirm dialog 2016-12-07 11:44:09 +01:00
yflory
6feb8548b3 Prevent the proxy handlers from being called on the parents 2016-12-07 11:12:35 +01:00
yflory
740b6e955e Improve UI, fix issues with the table 2016-12-06 18:55:10 +01:00
ansuz
94fbc2dca4 prototype cryptographic login 2016-12-06 17:34:24 +01:00
ansuz
a23b3d3517 use new ot in code too 2016-12-06 16:22:58 +01:00
ansuz
de0863e232 use new ot 2016-12-06 16:22:42 +01:00
ansuz
4cd9bd5534 strip listeners 2016-12-06 16:21:11 +01:00
ansuz
b79618c94a don't allow listeners in /slide/ 2016-12-06 16:00:38 +01:00
ansuz
ebff304602 turn off some unwanted behaviour 2016-12-06 15:16:43 +01:00
yflory
6dff82ede2 Improve UI, scrollbar in the table, publish/admin buttons 2016-12-05 18:54:46 +01:00
yflory
90804ed9e0 Add usernames/userlist in the toolbar and fix publish button 2016-12-01 18:40:09 +01:00
yflory
3632834500 Lock inputs when the user is not editing them 2016-11-30 18:39:19 +01:00
yflory
eaeaf4df40 Improve UI, add title input and forget button 2016-11-29 18:57:31 +01:00
yflory
bca746bbb5 Fix uncommitted column, add toolbar 2016-11-28 18:38:06 +01:00
yflory
ffedcb63f7 Display own column at the beginning, add uncommitted column 2016-11-25 18:17:03 +01:00
ansuz
4a4d4a0474 most recent work 2016-11-25 12:02:58 +01:00
ansuz
e5ff7020fb move buttons out of form 2016-11-25 12:02:37 +01:00
yflory
c88fa34558 Improve UI, fix issues with new file manager channels 2016-11-24 18:58:29 +01:00
yflory
5a5451d94c Sort elements in the trash, add properties in the context menu, fix issue with Edge 2016-11-23 18:21:45 +01:00
yflory
19e4a2d044 Create new files, sort displayed elements 2016-11-22 18:31:49 +01:00
yflory
a957b72598 Create a new pad from the file manager 2016-11-21 18:49:13 +01:00
yflory
4fcdece4af Test create new pad from the file manager 2016-11-18 17:42:07 +01:00
yflory
d6e1215166 Refresh the directory if needed when the object has changed 2016-11-18 17:17:48 +01:00
yflory
118829617f Use the FS store as default store 2016-11-17 18:27:55 +01:00
yflory
aa14ea7ac4 Use the old store format 2016-11-16 18:11:44 +01:00
yflory
da19608269 Translate the context menus, Shift+Del shortcut and realtime object 2016-11-16 17:11:48 +01:00
yflory
7a035fa4a0 Fix drag and drop with multiple elements selected 2016-11-15 18:15:54 +01:00
yflory
d77970975c Add translations, ability to select multiple elements, clean the code 2016-11-14 18:41:42 +01:00
ansuz
eb50177201 do a bit of work to preserve cursors 2016-11-14 18:03:17 +01:00
ansuz
ac43f4cb1f new prototype poll 2016-11-14 15:56:49 +01:00
yflory
f05efbb113 Clean the code 2016-11-14 11:06:00 +01:00
yflory
851d3df656 Ability to see, move and delete unsorted files 2016-11-10 18:33:44 +01:00
yflory
43d93938c3 Fix the list, find the unsorted files, ability to add a folder 2016-11-09 18:25:08 +01:00
yflory
cfe3d38197 Add expend/collapse to the tree, fix CSS, add list/grid view modes 2016-11-08 18:53:47 +01:00
yflory
c9cd06514c Add "restore" from trash, improve drag and drop and update css 2016-11-07 18:50:42 +01:00
ansuz
4c5cb79c20 Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
2016-11-07 15:08:49 +01:00
ansuz
c2770a7a74 set correct hash even if browser does not implement replaceState 2016-11-07 15:03:17 +01:00
ansuz
d009b7400c fall back to default title if one is not suggested 2016-11-07 12:29:57 +01:00
ansuz
e77ad4e909 better fixes for export 2016-11-07 12:26:48 +01:00
ansuz
75dd4a5926 slightly better test for variable 2016-11-07 12:11:01 +01:00
ansuz
b7d9998b9b fix reference to undefined variable 2016-11-07 12:10:00 +01:00
ansuz
303c65f2c3 use replaceState if available, instead of setting the hash 2016-11-07 11:20:30 +01:00
yflory
8e1bff706b Add drag and drop, rename and delete actions 2016-11-04 18:52:26 +01:00
ansuz
67bf41627d comment out dead code so CI doesn't complain 2016-11-04 17:09:13 +01:00
ansuz
002e22ee9a turn off unwanted behaviour until we can do it correctly 2016-11-04 16:17:59 +01:00
ansuz
5fc44a6e4b Merge branch 'soon' into fixpolls 2016-11-04 14:23:07 +01:00
yflory
ce9eb47351 Initial state of the file manager app 2016-11-03 18:51:30 +01:00
ansuz
2d5448458b export messages 2016-11-03 12:45:11 +01:00
ansuz
b1370c05b7 add translation completeness test to assertion page 2016-11-03 12:44:12 +01:00
ansuz
5f6ebb5cc1 fix incorrect regex for c-like title detection 2016-11-03 11:30:46 +01:00
ansuz
d512b113cd address failure to parse url when hash is not present 2016-11-02 18:28:19 +01:00
ansuz
6ae851ffdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon 2016-11-02 13:01:40 +01:00
ansuz
636b0fcadc do our best to keep the console quiet 2016-11-02 12:09:41 +01:00
yflory
3de4e5709b Clean the code 2016-10-26 17:50:59 +02:00
yflory
ab1d3958ce Add a pencil icon when hovering the title 2016-10-26 17:49:16 +02:00
yflory
6d1e06cca3 Add notifications when a user joins or leaves the channel 2016-10-26 15:02:30 +02:00
yflory
54a63267cd Add a share button and merge the viewers and editors buttons 2016-10-25 18:34:23 +02:00
yflory
87d86384ac Fix broken elements in the new toolbar 2016-10-25 17:29:13 +02:00
yflory
6351d1856f Remove the top bar and move its content in the applications' toolbars 2016-10-25 15:22:35 +02:00
yflory
3d74290c7d Merge branch 'usability5' into staging 2016-10-24 18:33:10 +02:00
yflory
9e92a597b3 Ability to edit the title in the toolbar by clicking it 2016-10-24 18:32:43 +02:00
ansuz
0a9d34a6c9 hide appended color pickers 2016-10-24 15:30:23 +02:00
ansuz
c858b247c1 filter absent users from the userlist 2016-10-24 15:11:19 +02:00
ansuz
ac3ddbab70 expose userList for later usage 2016-10-24 15:10:49 +02:00
ansuz
a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging 2016-10-24 14:54:35 +02:00
Yann Flory
10bb5e1607 Add the title in the toolbar 2016-10-21 18:16:27 +02:00
Yann Flory
1e003b13a8 ask anonymous, first-time users to set their name when they first join a pad 2016-10-21 15:17:15 +02:00
ansuz
5d9b81ab2f Merge pull request #53 from xwiki-labs/update
minor fixes to html and userlist
2016-10-20 11:54:29 +02:00
ansuz
46c5f64369 remove absent users from the userlist 2016-10-19 12:30:25 +02:00
yflory
51a79c5218 Remove unused dependency 2016-10-18 13:38:48 +02:00
yflory
9a733bb360 Fix dropdown menus with Edge 2016-10-13 15:00:53 +02:00
yflory
39bbf8a6c1 Fix the new userlist button and make the toolbar responsive 2016-10-13 14:24:59 +02:00
yflory
24fbe22c9d Improve the toolbar style and the way the userlist is displayed 2016-10-12 18:40:26 +02:00
yflory
d2389a5729 Change the userlist in the toolbar 2016-10-11 18:39:43 +02:00
yflory
e739c49e7f Remove the 'about' button in ckeditor 2016-10-11 11:57:07 +02:00
yflory
b23fe783e3 Fix the color picker in Chrome and hide the buttons when not supported 2016-10-10 18:21:18 +02:00
yflory
91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 2016-10-10 17:07:50 +02:00
yflory
53fe002d3b Merge branch 'slide' into soon 2016-10-10 17:06:39 +02:00
yflory
6c04b7967d Remove unused library 2016-10-10 17:03:25 +02:00
yflory
d63c912af0 Use the HTML5 color picker to change the colors in slides 2016-10-10 17:01:04 +02:00
ansuz
bb2317d8e6 fix chrome style bug by forcing reload of style sheet 2016-10-07 17:41:52 +02:00
yflory
765498e88e Remove the support for old.cryptpad.fr 2016-10-07 10:39:48 +02:00
yflory
d7e170c797 Test colorpicker 2016-10-07 10:31:36 +02:00
Yann Flory
81fce1237f Colorpicker to choose the background color in present mode 2016-10-06 18:04:35 +02:00
yflory
5300bc363c Fix a race condition in the slide application 2016-10-05 18:26:32 +02:00
yflory
c322aa440e Fix the username icon hcih was not working anymore 2016-10-05 18:19:52 +02:00
yflory
8575f3f79f Fix the "rename" feature which was not working anymore in some cases 2016-10-05 17:22:56 +02:00
yflory
a989b51d74 Fix race conditions with Alertify 2016-10-05 16:04:21 +02:00
yflory
74df38f94f Fix race conditions that could prevent applications from being loaded 2016-10-05 11:19:18 +02:00
ansuz
a28daf2715 use websocket url configuration api 2016-10-04 17:13:15 +02:00
ansuz
dbc8f01b8b fix merge errors and reach full jshint compliance 2016-10-04 16:58:10 +02:00
yflory
a30e17121d Merge branch 'readonlyButton' into soon 2016-10-04 15:48:52 +02:00
yflory
e84a54556c Move the toolbar buttons' events handlers in cryptpad-common 2016-10-04 15:44:12 +02:00
ansuz
2ac1b02572 Merge branch 'config-sockets' into soon 2016-10-04 14:38:50 +02:00
ansuz
11f63c861c Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title 2016-10-04 11:23:04 +02:00
ansuz
5e76194262 use new config api 2016-10-03 19:28:36 +02:00
ansuz
3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
yflory
76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +02:00
yflory
1c808b3da8 Add comment for the 'important' css rule 2016-10-03 16:09:59 +02:00
yflory
17b4f91810 Do not share the title in the doc if it is the default title 2016-10-03 16:05:39 +02:00
yflory
391728ee6d Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
yflory
8c33218ceb Move the codemirror themes in /common 2016-10-03 14:19:37 +02:00
Yann Flory
2609af2105 Use the CodeMirror editor in the slide application 2016-09-30 17:39:16 +02:00
yflory
b5b0eacebc Remove the old (non-bower) codemirror 2016-09-29 16:24:26 +02:00
yflory
261d2fecbc Get codemirror from bower and use that version in the code app 2016-09-29 16:23:27 +02:00
yflory
bc73fa2074 Merge branch 'fontawesome' into soon 2016-09-29 14:52:48 +02:00
yflory
f03018f3bc Improve the top bar and use the font awesome icons in /code 2016-09-28 15:28:25 +02:00
ansuz
0be8c333e0 Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome 2016-09-28 09:01:33 +02:00
yflory
3d54413343 Improve the UI with FontAwesome icons 2016-09-27 18:33:03 +02:00
ansuz
a266f0bee1 query parameter for messages 2016-09-27 11:01:32 +02:00
yflory
c16e8d603b Enable reconnecting websocket in code pad 2016-09-26 16:06:23 +02:00
ansuz
d6525087c7 jshint compliancy 2016-09-23 17:53:24 +02:00
ansuz
ed9acf1c00 Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName 2016-09-23 16:40:07 +02:00
ansuz
a4843cb5d7 Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict 2016-09-23 16:07:46 +02:00
ansuz
a82b7aaf8b allow empty names 2016-09-23 16:06:46 +02:00
yflory
2267ec8c43 Slides in read-only were not updated with the latest content 2016-09-23 15:12:17 +02:00
Yann Flory
eac0cdd6dd Enable read-only mode in slides 2016-09-23 12:26:06 +02:00
yflory
d46bd1af5c Improve the toolbar UI with the username displayed 2016-09-22 17:56:51 +02:00
yflory
79884e2400 Use the same username for all pads 2016-09-22 17:12:46 +02:00
yflory
73d5ea967b Fix an error created by the merge 2016-09-22 16:34:06 +02:00
yflory
dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
yflory
99004428d5 Enable the read-only mode in Cryptpoll 2016-09-22 16:09:20 +02:00
yflory
47e8be1681 Remove the IMPORT button and editor toolbars in read-only mode 2016-09-21 15:03:36 +02:00
ansuz
f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
ansuz
a9e2ca8d72 make tests green again 2016-09-20 23:31:29 +02:00
yflory
83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz
e6785b4dad push /pad/ state once ready to avoid OT collision 2016-09-20 16:35:55 +02:00