dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,651 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

339 Commits

Author SHA1 Message Date
Pierre Bondoerffer a5f9b49bfb
make poll box bigger so it show text in smaller windows 2017-08-11 13:09:34 +02:00
Pierre Bondoerffer c036bb26be
use proper bootstrap class 2017-08-09 15:46:17 +02:00
Pierre Bondoerffer 8b2cb37c2f
improve poll looks 2017-08-09 12:33:40 +02:00
Pierre Bondoerffer 5821d3e72f
remove useless title 2017-08-09 11:25:58 +02:00
Pierre Bondoerffer 798a3dc520
automatically fill in display name in poll 2017-08-07 12:19:21 +02:00
Pierre Bondoerffer 0588564bc9
overflow on poll div 2017-08-07 11:49:10 +02:00
yflory 43ac71603c Move pad attributes in pad data 2017-07-05 12:26:42 +02:00
ansuz fa06f9d413 fix minor bugs in poll 2017-07-04 15:09:09 +02:00
ansuz 4a5f5de78c restore missing stylesheet for poll 2017-06-29 14:35:23 +02:00
ansuz 7a5c5ce0a3 load scripts asynchronously 2017-06-29 12:17:08 +02:00
ansuz 7de2683169 make all apps use clientside templates 2017-06-27 18:17:52 +02:00
ansuz bdca6b10c2 use templates in poll.js 2017-06-27 15:38:12 +02:00
ansuz e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00
yflory 684269fdda Userlist in polls 2017-06-22 16:14:54 +02:00
ansuz 852c028822 don't allow editing if pad type is wrong 2017-06-22 14:31:55 +02:00
Pierre Bondoerffer 626e54d7b5
Fix poll auto-focus inputs 2017-06-19 15:30:22 +02:00
Pierre Bondoerffer d344f03778
proper button text 2017-06-12 18:57:07 +02:00
Pierre Bondoerffer 2b5339193c
bring admin back 2017-06-12 18:45:04 +02:00
Pierre Bondoerffer b2eef94232
use numbers, not strings 2017-06-12 18:35:13 +02:00
Pierre Bondoerffer 848010842f
dont sanity check silently 2017-06-12 18:26:27 +02:00
Pierre Bondoerffer 56f2c46c75
document a line 2017-06-12 18:25:06 +02:00
Pierre Bondoerffer cd1c957929
NaN safety 2017-06-12 18:23:17 +02:00
Pierre Bondoerffer 0118fdbd00
use a local variable 2017-06-12 18:16:11 +02:00
Pierre Bondoerffer b8e394db67
poll: Implement multiple choices 2017-06-12 18:01:51 +02:00
Pierre Bondoerffer 685b352db8
poll: Add show help button 2017-06-12 14:25:10 +02:00
Pierre Bondoerffer 5d565660a9
tiny fixes 2017-06-12 12:41:03 +02:00
Pierre Bondoerffer 6bc191725f
poll: support disconnect and fix trash button 2017-06-12 12:37:07 +02:00
Pierre Bondoerffer 6dd80c26b1
Make editing more visible 2017-06-12 12:00:39 +02:00
ansuz 76c530037b enable donate button in all apps 2017-05-30 15:51:07 +02:00
Pierre Bondoerffer f434f002c4
poll: make locks clickable 2017-05-29 16:32:40 +02:00
Pierre Bondoerffer 1092285a68
merge master 2017-05-26 16:18:51 +02:00
yflory ff16084719 Fix lint errors 2017-05-09 18:10:02 +02:00
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 2017-05-09 17:47:47 +02:00
yflory 5a883d5a57 Use the new toolbar and move the userlist code in a separate file 2017-05-05 17:56:49 +02:00
ansuz 78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 2017-04-18 12:14:32 +02:00
Pierre Bondoerffer 7a05462eb3
Some more poll changes <3 2017-04-14 19:34:58 +02:00
Pierre Bondoerffer 05785e96ea
small color change 2017-04-14 17:47:05 +02:00
Pierre Bondoerffer 20c252e5c6
fix placeholder styling in safari 2017-04-14 12:45:45 +02:00
ansuz 8f4dbcf4c6 remove getPadTitle 2017-04-14 11:41:18 +02:00
ansuz bf047fcf65 Merge pull request #110 from pbondoer/newpoll 
Fix flash of autocomplete in poll
 2017-04-13 19:43:30 +02:00
Pierre Bondoerffer 96ff487271
fix flash of content 2017-04-13 19:36:04 +02:00
ansuz 5a7eea08c8 Merge pull request #108 from pbondoer/newpoll 
Poll fixes
 2017-04-13 18:04:13 +02:00
Pierre Bondoerffer 248f88034b
important fixes 2017-04-13 17:56:28 +02:00
Pierre Bondoerffer 6b57bb2bbb
poll: press enter to validate input 2017-04-13 17:09:31 +02:00
Pierre Bondoerffer d483e10e77
poll fixes 2017-04-13 17:07:09 +02:00
Pierre Bondoerffer ea5301be13
poll improved(tm) 2017-04-13 16:31:57 +02:00
Pierre Bondoerffer 7434dbcb0f
what i have 2017-04-13 15:27:37 +02:00
Pierre Bondoerffer f11cf8e6ac
move poll styles to separate file 2017-04-13 14:14:12 +02:00
ansuz df4a250359 use feedback api instead of app= 2017-04-13 12:18:08 +02:00
ansuz 9a46b58c85 deprecate this 90 days after f-release 2017-04-12 16:03:41 +02:00
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 2017-04-10 14:19:15 +02:00
yflory a9777ce560 Fix input losing focus in polls with Chrome 57 2017-04-05 12:04:01 +02:00
yflory 71c59d7ae2 Remove unnecessary TODOs 2017-03-27 11:53:13 +02:00
ansuz 912215185f add uid to userdata for better notifications 2017-03-24 13:32:42 +01:00
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
yflory a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls 2017-03-15 16:01:00 +01:00
yflory 459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 2017-03-08 18:05:15 +01:00
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it 2017-03-03 18:14:53 +01:00
ansuz 08c862b271 add FIXME notes to poll 2017-03-03 16:13:32 +01:00
yflory a68acac13b Only ask for a display name once in /poll 2017-03-03 12:07:16 +01:00
Pierre Bondoerffer 800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:44:29 +01:00
Pierre Bondoerffer d26d8f53d9
(CSS) Fixed textarea being too large 2017-03-02 15:50:03 +01:00
Caleb James DeLisle 91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it. 
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
 2017-03-01 21:06:53 +01:00
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 2017-03-01 17:05:57 +01:00
yflory 11d54256da Make sure the display name is displayed in the same way everywhere 2017-03-01 13:10:06 +01:00
ansuz 86adfbf27d update cache-busting directive in all supported apps 2017-02-28 10:47:18 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +01:00
yflory bdc00a2413 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-22 12:25:48 +01:00
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 2017-02-22 12:25:29 +01:00
ansuz 89f3577058 remove old poll 2017-02-22 11:05:47 +01:00
yflory c72bbd4c37 Use the file name as initial title 2017-02-21 17:42:58 +01:00
yflory 47b8fefd9e Load messages.js only once, in cryptpad-common 2017-02-21 14:16:23 +01:00
yflory c17f28e5fe Fix race condition #2 2017-02-17 15:39:34 +01:00
ansuz 8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +01:00
yflory e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 2017-02-16 15:35:03 +01:00
yflory 914c442615 Do not redirect to home page when logging out from another tab 2017-02-08 12:54:07 +01:00
yflory 75f1eed712 Merge branch 'newtoolbar' into hpbs 2017-01-25 10:21:50 +01:00
yflory 373b07ed28 Fix lint errors 2017-01-25 10:21:31 +01:00
yflory 097f78d777 Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar 2017-01-25 10:01:49 +01:00
yflory 8ccd845d52 Merge branch 'newtoolbar' into hpbs 2017-01-24 12:54:32 +01:00
yflory ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00
yflory c77abfa7f4 Remove a second scrollbar in polls 2017-01-23 11:05:13 +01:00
yflory 5e36d9ea29 Fix polls table not updated with local events 2017-01-23 10:53:01 +01:00
yflory d1bed5ae4b Fix polls table not updated with local events 2017-01-23 10:51:44 +01:00
yflory 26bea774cb Merge branch 'newtoolbar' into hpbs 2017-01-19 15:52:12 +01:00
yflory ea8667302c Display only a placeholder when the poll title is default 2017-01-19 15:35:38 +01:00
yflory 7d66d391fc Merge branch 'newtoolbar' into hpbs 2017-01-19 15:17:30 +01:00
yflory 5d5d03163e Add favicon and notifications in polls 2017-01-19 14:52:12 +01:00
yflory fa8a0d5880 Merge branch 'newtoolbar' into hpbs 2017-01-19 10:53:55 +01:00
yflory 69bee7d79a Add data into the homepage 2017-01-18 18:02:32 +01:00
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar 2017-01-18 11:00:46 +01:00
yflory a9063e0459 Reload all tabs when the user logs in or out 2017-01-16 14:08:44 +01:00
yflory 767ba8b549 Select what we want to display in the toolbar 2017-01-13 17:14:44 +01:00
yflory 2afdc11327 Replace the username button by a dropdown menu 2017-01-13 17:11:12 +01:00
yflory 4963c77b61 Fix the title reset bug 2017-01-12 14:29:40 +01:00
yflory 4278ac7637 Merge branch 'soon' into fileManager 2017-01-10 15:07:48 +01:00
ansuz 74a12f50ac only migrate keys which don't already exist 2017-01-09 17:35:58 +01:00
yflory 5b08fed7fa Ability to add files from the drive toolbar 
Fix CSS issues with the different toolbars
Translate the backup URL button alert
 2017-01-09 16:29:16 +01:00
ansuz 0373556475 support old hashes in /poll 2017-01-09 11:46:21 +01:00
yflory 1e70af0c16 Use the same network for the apps and the file store 2017-01-06 13:52:53 +01:00
ansuz 5080751a90 hide unnecessary scrollbar 2017-01-05 10:58:10 +01:00
ansuz 95617a11c8 fix broken paths in old poll 2017-01-05 10:57:13 +01:00
ansuz 05a956879a prepare new poll app for release 
move old poll into poll/old
 2017-01-04 15:48:50 +01:00
ansuz 34967ac354 encapsulate rendering functions so we can pass in cryptpad-common 2016-12-30 13:27:01 +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 e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
yflory 87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
yflory e3f484d876 File manager in the home page, lint 2016-12-19 17:53:03 +01:00
yflory 5bc7766f44 Use a consistent toolbar across all apps 2016-12-16 18:35:49 +01:00
yflory ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory 5cd7d8ec84 Fix undefined userid in new poll 2016-12-08 10:19:23 +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 740b6e955e Improve UI, fix issues with the table 2016-12-06 18:55:10 +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
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
ansuz c2770a7a74 set correct hash even if browser does not implement replaceState 2016-11-07 15:03:17 +01:00
ansuz 303c65f2c3 use replaceState if available, instead of setting the hash 2016-11-07 11:20:30 +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
ansuz 636b0fcadc do our best to keep the console quiet 2016-11-02 12:09:41 +01:00
ansuz ac3ddbab70 expose userList for later usage 2016-10-24 15:10:49 +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
yflory 76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +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 a266f0bee1 query parameter for messages 2016-09-27 11:01:32 +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
ansuz f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
ansuz bf5dac58dd Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc 2016-09-20 14:13:35 +02:00
Yann Flory 6363d3fb90 Pad titles are now shared with the userdoc 2016-09-16 12:49:47 +02:00
yflory 5c63585952 Complete the French translation 2016-09-15 18:35:09 +02:00
yflory 25c8d16bf5 Use a new version-prefixed hash parser 2016-09-13 17:43:56 +02:00
ansuz c35c7cda20 hide wizard after computing results 2016-09-13 16:02:38 +02:00
ansuz 0dae949c4f fix scrolljank bug 2016-09-13 15:34:10 +02:00
ansuz 848f16e8f5 unused function which computes values for the table 2016-08-22 11:41:23 +02:00
ansuz d64e06c12e don't make empty options 2016-08-19 12:14:20 +02:00
ansuz a3f6fe8843 lock options by default 
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
 2016-08-19 11:26:48 +02:00
ansuz 269eba3c47 remove commit button if a user is removed 2016-08-18 18:31:01 +02:00
ansuz f8f66800d1 display a 'commit' button which locks your column 2016-08-18 17:54:17 +02:00
ansuz 85540bad12 leave all columns locked unless you've visited before 2016-08-18 16:13:03 +02:00
ansuz d679cac666 fewer log statements for the console 2016-08-18 15:27:55 +02:00
ansuz 235c0482f9 increase clickable area around editable columns' checkboxes 2016-08-18 13:25:21 +02:00
ansuz c76aaac542 don't make columns with empty names 2016-08-18 12:41:49 +02:00
ansuz d85684ef74 usability improvements 
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
 2016-08-18 12:06:13 +02:00
ansuz 76bfb6ab35 detect whether you are new to a page 
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
 2016-08-17 18:38:27 +02:00
ansuz e2b162bf6d snapshot some dead code 2016-08-17 15:29:04 +02:00
ansuz fd0a7337a3 wait a full minute until requirejs times out 2016-08-04 12:44:27 +02:00
ansuz 01d9923e15 export Cryptpad at window level 2016-08-02 18:55:45 +02:00
ansuz 600f3151e9 don't use the store until it's ready to be used 2016-08-02 12:11:40 +02:00
ansuz 1f24d7126c big ugly commit that will be really hard to audit 
This changeset applies new styles to the poll.

it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.

The changes to the poll just happened to coincide with the async stuff.

My apologies to anyone who wants to read this whole thing
 2016-07-28 17:44:40 +02:00
ansuz c09166efe2 scroll down when adding a new option to the table 2016-07-25 15:42:46 +02:00
ansuz 68f8d0101d fix flash of unstyled content 2016-07-25 15:28:27 +02:00
ansuz 8ea6c03094 notify user on disconnect 
also disable inputs
 2016-07-25 11:57:06 +02:00
ansuz 2351d8a23e make tests green again 2016-07-22 16:00:33 +02:00
ansuz 068a3f5944 remove rows from the poll 2016-07-22 15:42:41 +02:00
ansuz 2f2ab4392c clear the table on user clicks 2016-07-20 12:23:41 +02:00
ansuz 64f030c344 add a clear table button 2016-07-20 12:23:08 +02:00
ansuz d2c5cfe646 add col/row ids to arrays 2016-07-20 12:22:49 +02:00
ansuz f77e2cec34 set text values of new options 2016-07-19 17:27:40 +02:00
ansuz 52ab5147c9 add a missing semicolon so tests don't fail 2016-07-19 16:23:39 +02:00
ansuz e3f4df7e0a push my latest changes because I'm agile 2016-07-19 16:22:44 +02:00
ansuz cde239c97a implement row/column removal 2016-07-18 20:57:53 +02:00
ansuz 9860b7427a addition signs are slightly informative 2016-07-18 20:57:35 +02:00
ansuz ac50bf7286 height and width of the table are unreliable because of multiple users. remove them 2016-07-18 19:49:43 +02:00
ansuz a3254a2619 consistent ordering of columns and rows 2016-07-18 19:49:12 +02:00
ansuz d30eddf2f2 ui hint for 'adduser' and 'addoption' 2016-07-18 19:48:24 +02:00
ansuz ebf5c27453 add rename and forget buttons to poll app 2016-07-16 12:37:17 +02:00
ansuz f7a1332317 add a 'back' button 2016-07-15 19:09:35 +02:00
ansuz 7dd1624206 commit polls to localStorage 2016-07-15 18:47:07 +02:00
ansuz 0cf5f3cc87 realtime polls! 2016-07-15 16:46:50 +02:00