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
yflory c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
yflory 354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
Caleb James DeLisle 7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window 2017-11-09 17:07:04 +01:00
Caleb James DeLisle 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
yflory 6b9ffe8dd1 Make thumbnails more secure 2017-11-07 14:51:53 +01:00
yflory a592317e35 lint compliance 2017-11-06 15:49:40 +01:00
yflory 9060464f37 Create thumbnails only when the tab is not focused 2017-11-06 13:36:54 +01:00
yflory 5dff9a32b6 Fix comments order in polls 2017-11-03 18:38:04 +01:00
yflory 8de9a596f1 Fix cursor in thumbnails 2017-11-02 19:11:27 +01:00
ansuz 11b8b380fd Merge branch 'staging' into evilham 2017-10-30 14:50:11 +01:00
Evilham 5dcfbd07ab Merge branch 'theming-improvement' into staging 2017-10-27 18:32:08 +02:00
Evilham 4933aafbc8 Added default values to avoid breaking existing themes. 2017-10-27 18:31:52 +02:00
yflory 1245b4d244 Enable thumbnails in poll and whiteboard 2017-10-27 13:31:41 +02:00
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
ansuz 8359902f6a fix typo in poll 2017-10-24 17:42:08 +02:00
yflory 2dd3c42fd5 Fix handlers registered again on reconnect in drive and poll 2017-10-24 10:42:08 +02:00
yflory a0bcb901d3 Add titles in poll when options or usernames are overflowing 2017-10-23 15:16:51 +02:00
yflory 74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz c17fc2efe7 improve option order in poll 2017-10-23 14:53:31 +02:00
ansuz bf832ba784 fix comment overflow 2017-10-19 17:30:40 +02:00
yflory 7bc2f81852 Fix pinned column not always stored in polls 2017-10-19 16:01:56 +02:00
yflory 8e1f15e88d Get title suggestion based on poll's description 2017-10-12 14:12:26 +02:00
yflory 91381ca77d Fix lint errors 2017-10-12 12:20:27 +02:00
yflory 50090a3af6 Add placeholders for the comment form in poll 2017-10-12 12:18:32 +02:00
yflory a5a08176fb Merge branch 'master' into staging 2017-10-11 16:58:45 +02:00
yflory 54b5a2d654 Fix style issues in poll (Chrome) 2017-10-11 16:01:26 +02:00
yflory 86767184da Fix style issues in poll for Edge 2017-10-11 15:38:23 +02:00
yflory 00e8d32d60 Fix column position in poll for Chrome 2017-10-11 15:37:47 +02:00
yflory b110e1b8da Fix style issues in poll for Edge 2017-10-11 15:37:11 +02:00
yflory ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +02:00
yflory 75b3ff9c60 CSS issue in polls 2017-10-10 11:35:24 +02:00
yflory c46280d032 Fix style issues for Edge 2017-10-10 11:32:52 +02:00
yflory 4c19375f4d Avoid missing characters in poll's inputs 2017-10-09 15:11:02 +02:00
yflory dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +02:00
yflory 888028c542 Lint 2017-10-05 18:13:28 +02:00
yflory 1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
yflory 26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory 846b1a9fb3 Improve description UI in poll. Enable tags and mediatag 2017-10-04 15:39:18 +02:00
yflory 68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
yflory 707d3b3e94 Ability to export polls as csv 2017-10-03 16:50:59 +02:00
yflory 5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
yflory 126742a1c3 Fix bugs in sframe poll and update UI 2017-10-02 19:02:31 +02:00
yflory 66da349ee4 Sandboxed Poll app with less2 2017-09-27 18:52:04 +02:00
yflory c1275b5671 Prepare secure poll 2017-09-27 10:28:10 +02:00
yflory 4c394e0031 Fix UI issue in poll 2017-09-27 10:15:23 +02:00
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 2017-09-13 14:47:50 +02:00
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
Caleb James DeLisle b081603455 Update requirejs 2017-08-21 18:08:37 +02:00
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