Commit Graph

2006 Commits (1179992a90a98a1e4a6fd8df43ce3344e7caae1b)

Author SHA1 Message Date
XWiki SAS 74c9b663dd changing whiteboard 2017-06-13 14:14:36 +02:00
XWiki SAS 40cf7ea107 change whiteboard 2017-06-13 14:11:22 +02:00
ansuz 1b574da053 fix typo 2017-06-13 12:24:32 +02:00
ansuz 7ad89bd9af don't interrupt boot because of localStorage failure 2017-06-13 12:02:36 +02:00
ansuz 3337e2133a more thorough tests for localStorage presence 2017-06-13 11:57:21 +02:00
yflory a57f8679c5 Fix a race condition in the file app 2017-06-13 11:45:37 +02:00
yflory 4eeea93265 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:38:16 +02:00
yflory 11e2226f1a Fix lint errors 2017-06-13 11:38:04 +02:00
ansuz c779e328e8 warn users if their browser does not support localStorage 2017-06-13 11:33:25 +02:00
yflory d7292e69c6 Fix undefined variable 2017-06-13 11:25:12 +02:00
ansuz d367f71760 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:24:57 +02:00
ansuz c70eb73d52 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:24:20 +02:00
yflory 803bad1421 Move the file upload code in a separate file 2017-06-13 11:21:26 +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
XWiki SAS 49370764c1 change whiteboard translation 2017-06-12 18:14:33 +02:00
Pierre Bondoerffer b8e394db67
poll: Implement multiple choices 2017-06-12 18:01:51 +02:00
yflory a58162a617 Make the drive tests work when not logged in 2017-06-12 17:49:33 +02:00
XWiki SAS c702313489 change label texte 2017-06-12 17:34:45 +02:00
yflory 2fb5e3ae35 Merge branch 'staging' into newToolbar 2017-06-12 17:00:07 +02:00
yflory 969cec5d60 Make sure everything is synced before migrating the drive 2017-06-12 16:19:45 +02:00
yflory 7dd9ed543a Merge branch 'newDrive' into staging 2017-06-12 16:08:09 +02:00
yflory 376b60c21c New toolbar temp 2017-06-12 15:59:24 +02:00
yflory 9c5bade83e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 14:37:29 +02:00
yflory d1f4617419 Fix a race condition causing the preview part to be empty 2017-06-12 14:37:12 +02:00
ansuz c9725af508 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 14:34:01 +02:00
ansuz db9b9547d9 don't complain about missing callbacks for messages which are not our responsibility 2017-06-12 14:33:50 +02:00
Pierre Bondoerffer 685b352db8
poll: Add show help button 2017-06-12 14:25:10 +02:00
yflory 30bdb9881c Fix undefined element in select dropdown menus 2017-06-12 14:23:06 +02:00
yflory 298e34a9de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 12:47:47 +02:00
yflory 8471dab6b1 Provide hints in theme and language dropdowns 2017-06-12 12:47:25 +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
ansuz b3221c0fb4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 12:32:48 +02:00
ansuz 0c957989d2 add link to upload table when complete 2017-06-12 12:31:52 +02:00
yflory 5d6a0dcc1b Fix width transition when dragging preview 2017-06-12 12:27:24 +02:00
Pierre Bondoerffer 6dd80c26b1
Make editing more visible 2017-06-12 12:00:39 +02:00
yflory 3ff3eac283 Fix a race condition causing the drive to be empty 2017-06-12 11:54:20 +02:00
yflory a5cb5f2ceb Merge branch 'staging' into newDrive 2017-06-12 10:51:38 +02:00
yflory 1b671edce9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 10:50:30 +02:00
yflory 9a4a6e9b40 Always display the upgrade button in the drive 2017-06-12 10:17:52 +02:00
yflory 9cc25d4c9f Merge branch 'staging' into newDrive 2017-06-09 17:03:01 +02:00
yflory 7134b00544 Add a button to display the context menu for the trash on mobiles 2017-06-09 17:02:50 +02:00
yflory d24458e4b0 Fix the tests to work with the async migration 2017-06-09 16:41:51 +02:00
yflory a57f7c6ce7 Fix lint errors 2017-06-09 16:39:44 +02:00
ansuz 4bcad3e154 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-09 16:26:36 +02:00
ansuz 47857ec382 use cached pinned usage data 2017-06-09 16:17:20 +02:00
yflory 75c3c10b20 Merge branch 'soon' into staging 2017-06-09 15:56:45 +02:00
yflory c1402fbb0a Lint error 2017-06-09 15:56:18 +02:00
yflory b36484931d Lint 2017-06-09 15:55:46 +02:00
yflory 1fb638f519 clean the code 2017-06-09 15:50:13 +02:00
yflory 9d758a040b Fix an issue with the search field not displayed properly 2017-06-09 15:45:46 +02:00
ansuz 08902c0910 drop extraneous argument 2017-06-09 15:33:28 +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
ansuz 8bad0c556e change log to error 2017-06-09 15:29:55 +02:00
ansuz b0e00d337e more careful validation 2017-06-09 15:28:53 +02:00
yflory fd88162624 Merge branch 'staging' into newDrive 2017-06-09 14:47:37 +02:00
yflory 7c9e86e351 Merge branch 'soon' into staging 2017-06-09 14:47:15 +02:00
yflory 9694272083 Fix html code not parsed 2017-06-09 14:42:55 +02:00
yflory 9ca10ba524 Merge branch 'staging' into newDrive 2017-06-09 14:40:26 +02:00
yflory 7f120c8fc1 Merge branch 'soon' into staging 2017-06-09 14:38:36 +02:00
yflory 78e6118153 Merge branch 'staging' into newDrive 2017-06-09 14:38:21 +02:00
yflory 444c41974e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-09 14:37:54 +02:00
yflory df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2017-06-09 14:36:38 +02:00
yflory 6a96aa6819 Disconnect the network when migrating the drive in another tab 2017-06-09 14:36:35 +02:00
yflory 2a94bdaf05 test 2017-06-09 13:41:11 +02:00
yflory ca95b5c42b Remove unused console.log 2017-06-09 12:31:07 +02:00
yflory f8c69573fd Disconnect other tabs when migrating the drive 2017-06-09 12:23:28 +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 51e0d40572 Make sure the old storage key is removed after migration 2017-06-08 18:35:20 +02:00
yflory b0fe04381d Merge branch 'staging' into newDrive 2017-06-08 18:14:31 +02:00
ansuz fe2fef5e4c support dragging and dropping multiple files 2017-06-08 18:12:17 +02:00
yflory 1c2ea04f11 Drive refactoring 2017-06-08 17:52:00 +02:00
ansuz fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors 2017-06-08 14:19:14 +02:00
ansuz e723228060 always show upgrade button in drive 2017-06-08 14:03:01 +02:00
ansuz da533b106a improve type checking in getFileSize 2017-06-08 11:24:20 +02:00
ansuz 2f851ab97e fix lint errors 2017-06-07 10:13:51 +02:00
ansuz d25477e8c6 don't let tooltips interfere with DOM interaction 2017-06-06 18:08:23 +02:00
yflory 811d031ffd Fix the 'File' entry in the drive 'New' menu 2017-06-06 12:09:55 +02:00
yflory 5641a4a839 Add the file app in the 'new' dropdown menus 2017-06-06 11:52:47 +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 f43132a63b bump version in footer and package.json 2017-06-06 10:01:07 +02:00
ansuz ec9a4dec5e Merge branch 'soon' into staging 2017-06-05 11:43:26 +02:00
ansuz 77d4ffba86 animate preview mode sidebar 2017-06-02 17:39:45 +02:00
ansuz 65233c2464 remove unused variable 2017-06-02 16:16:17 +02:00
ansuz 767793b5ca fix stuck loading tip 2017-06-02 12:13:11 +02:00
ansuz 8f7aaecc1c cache some selectors and decrease memory demands 2017-06-02 11:45:54 +02:00
ansuz f631973f1f optimize file upload 2017-06-01 18:16:02 +02:00
ansuz 55af84cc90 lower spinner timeout interval 2017-06-01 14:27:06 +02:00
ansuz c65ca5cfc6 restore deleted line and add missing semicolon 2017-06-01 10:35:42 +02:00
ansuz 8bd9ad8847 add automated registration test 2017-06-01 10:23:50 +02:00
ansuz 07279c8dc7 export boolean Test.testing 2017-06-01 10:23:24 +02:00
Caleb James DeLisle c8bd1bb2ac Trying to improve the tests which fail always when running remotely 2017-06-01 00:29:17 +02:00
Caleb James DeLisle 71bd808e4f Send everything through the test global function 2017-06-01 00:09:39 +02:00
Caleb James DeLisle 244bd7b378 ;;; 2017-05-31 23:32:47 +02:00
Caleb James DeLisle 7d557df74b a new and more horrible way of sniffing the logs out of the instance 2017-05-31 23:29:58 +02:00
Caleb James DeLisle 0d4b74cfba ;;;;;; keep these ;;; for later ;;;;; 2017-05-31 19:46:23 +02:00
Caleb James DeLisle 24f37ea414 Delicious testing 2017-05-31 19:40:17 +02:00
ansuz 5e57578fa9 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-31 18:44:55 +02:00
ansuz 30f66ab7ba hotfix 'undefined/' bug 2017-05-31 18:44:44 +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
ansuz 105e5cdac9 fix 'undefined/' userHash 2017-05-31 18:01:12 +02:00
ansuz 401e908963 use media-tag with xhr error handling 2017-05-31 17:17:01 +02:00
ansuz 3465710237 Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag 2017-05-31 12:55:05 +02:00
Daniel RADEAU 8ab9248a78 Fix ES6 2017-05-31 12:42:37 +02:00
Daniel RADEAU 21c39572be Update media-tag and fix bower dependencies 2017-05-31 11:53:25 +02:00
ansuz daf112a5b5 take api settings into account for upgrade button 2017-05-30 20:11:15 +02:00
ansuz ebfa228bc0 add upgrade button to all static pages 2017-05-30 18:39:41 +02:00
ansuz 149568689a color donate button green 2017-05-30 17:58:31 +02:00
ansuz ec6ad6772b send feedback on donation 2017-05-30 17:25:36 +02:00
Daniel RADEAU cb2efe138b Media Tag integration, image, audio, video, pdf 2017-05-30 16:36:06 +02:00
ansuz 76c530037b enable donate button in all apps 2017-05-30 15:51:07 +02:00
ansuz 9ca5bc507e add support for donate button 2017-05-30 15:42:53 +02:00
ansuz a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-30 10:46:17 +02:00
ansuz 99a44f119f don't send referrer headers on pads which may link outward 2017-05-30 10:44:40 +02:00
ansuz 92a7970eb8 fix merge conflicts 2017-05-29 19:04:47 +02:00
ansuz 1240b864ef fix misconfigured history 2017-05-29 17:25:06 +02:00
Pierre Bondoerffer f434f002c4
poll: make locks clickable 2017-05-29 16:32:40 +02:00
ansuz 3915b30055 provide a register button on login
also direct users from file to login
2017-05-29 13:11:07 +02:00
Pierre Bondoerffer b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll 2017-05-29 12:59:49 +02:00
Caleb James DeLisle 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 2017-05-26 18:09:31 +02:00
Pierre Bondoerffer 1092285a68
merge master 2017-05-26 16:18:51 +02:00
Caleb James DeLisle 6c1861dbc6 Merge branch 'soon' into staging 2017-05-26 15:48:44 +02:00
Caleb James DeLisle 2ecf257fcd Sync localStorage with sessionStorage in auth because safari... 2017-05-26 15:30:01 +02:00
ansuz 3f3d64992d resolve merge conflicts 2017-05-26 12:44:58 +02:00
ansuz 57017c68fa hacks for cross-domain safari 2017-05-26 12:42:12 +02:00
ansuz cf658c1b3a backport live changes 2017-05-26 12:41:30 +02:00
ansuz a04f179d8b hide preview mode on phones 2017-05-24 19:00:14 +02:00
yflory df2b00122a New drive structure without file names 2017-05-24 18:59:44 +02:00
ansuz dc2b0ae6b4 jshint compliance 2017-05-24 18:45:48 +02:00
ansuz b32c329269 remember whether you were using preview mode for a pad 2017-05-24 18:41:19 +02:00
ansuz d9f7470f06 copy user details into sessionStorage for safari 2017-05-24 18:28:16 +02:00
ansuz a5ffd278a7 write styles for code in .less 2017-05-24 17:27:03 +02:00
ansuz 3803f6a20f only render preview if preview container is visible 2017-05-24 17:25:33 +02:00
ansuz 617e027f12 catch markdown preview errors 2017-05-24 15:50:35 +02:00
ansuz c5bb830757 don't preview if hightlight mode is not markdown 2017-05-24 14:21:31 +02:00
ansuz fd83ae3e61 implement createRandomInteger 2017-05-24 11:34:40 +02:00
ansuz 4d9060f49e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-24 11:28:06 +02:00
ansuz 378bf2aa94 yflory's word wrap fix 2017-05-24 11:27:31 +02:00
ansuz dc80b6b11f throttle markdown preview 2017-05-24 11:27:16 +02:00
yflory f5f8e148ca Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 18:09:42 +02:00
yflory 90f5713d4a Fix an issue with the search bar redirecting to incorrect location 2017-05-23 18:09:30 +02:00
ansuz 97cc4a6d54 add styling for tables in markdown preview 2017-05-23 18:03:35 +02:00
ansuz e6c04ccb49 bump server after paying for an account 2017-05-23 16:11:07 +02:00
ansuz 6faca87e73 set preview content in read only mode 2017-05-23 15:54:04 +02:00
ansuz 6324d9bbb0 feedback on template feature usage 2017-05-23 14:54:40 +02:00
yflory c3437382fb Fix the release version in the what's new popup 2017-05-23 11:22:32 +02:00
ansuz 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 18:43:14 +02:00
ansuz 70cae0d2c3 safely access pin reset response 2017-05-22 18:43:06 +02:00
yflory a50805545d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 17:56:49 +02:00
yflory d55b7e411c Display an alert in the drive when the limit is reached 2017-05-22 17:56:27 +02:00
ansuz dac9d0647d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 16:39:27 +02:00
ansuz 259d34b7c8 jshint compliance 2017-05-22 16:34:22 +02:00
yflory 40b99e7bbf Get the file name before downloading the entire file 2017-05-22 15:30:59 +02:00
ansuz 6dc3c62ba4 check for src before trying to ajax 2017-05-22 15:12:39 +02:00
ansuz a6cf761172 don't store media tag pages in the drive 2017-05-22 14:45:14 +02:00
yflory 90a9764fa4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 14:41:23 +02:00
yflory 346c289204 Fix lint errors 2017-05-22 14:39:58 +02:00
ansuz 71dc0af6c7 better test for success error codes 2017-05-22 14:37:57 +02:00
ansuz 0b6c587e2b fetch and decrypt metadata with range requests 2017-05-22 14:37:38 +02:00
yflory eb31d0323c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 12:32:10 +02:00
ansuz a99080fb74 push the rest of the code 2017-05-22 12:31:00 +02:00
yflory 408a4dad94 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 12:30:08 +02:00
yflory 3964f4feee Display the progress when downloading a file 2017-05-22 12:30:00 +02:00
ansuz dd73ad2dd5 add decryptMetadata function 2017-05-22 12:26:44 +02:00
ansuz 5179252d3b fix merge conflicts 2017-05-22 12:11:24 +02:00
ansuz 4ee42b87d4 make file crypto great again 2017-05-22 12:04:47 +02:00
yflory c45f08f147 Use a download button instead of downloading a file automatically 2017-05-22 11:43:45 +02:00
yflory 0c2f84058b Improve css for the file app 2017-05-22 11:16:01 +02:00
yflory 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 10:41:55 +02:00
yflory 538aec6ef5 Display a message when pinPads returns an error 2017-05-22 10:41:47 +02:00
ansuz 03da870a7a jshint compliance 2017-05-19 19:38:57 +02:00
ansuz af4fd3c6d3 resolve merge conflicts 2017-05-19 19:14:08 +02:00
yflory 67a04a16ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 18:44:46 +02:00
yflory 1ab6eb3c5d Add a queue for multiple uploads in the file app 2017-05-19 18:41:34 +02:00
ansuz ba5ef5157e show pretty representations of storage usage 2017-05-19 18:37:31 +02:00
ansuz 0a54f0cf2d better alignment of preview and code entry 2017-05-19 16:21:26 +02:00
ansuz e78299aed6 use async file decryption, listen for progress events. 2017-05-19 11:46:47 +02:00
ansuz bcd0303821 style /file/ with .less 2017-05-19 11:46:10 +02:00
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 09:13:38 +02:00
ansuz 310909dc9e handle new error codes 2017-05-19 09:12:59 +02:00
yflory d014fccfce Fix lint error 2017-05-18 18:52:14 +02:00
yflory 2082b328b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 18:51:21 +02:00
yflory 814c81fb13 Display an alert when CryptPad has a new version 2017-05-18 18:51:08 +02:00
ansuz 34606ea8ba use newest xwiki media-tag 2017-05-18 18:24:24 +02:00
ansuz 5a83259233 listen for decryption errors 2017-05-18 18:24:04 +02:00
ansuz 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 17:58:33 +02:00
ansuz d324a054f2 add progress bar to file upload 2017-05-18 17:57:42 +02:00
yflory 21f9e31e75 Add a placeholder for the user app 2017-05-18 15:56:35 +02:00
ansuz 164342920e fix inverted condition 2017-05-18 15:39:24 +02:00