Commit Graph

1787 Commits (75c3c10b207c3300d41361fe2afc81929efbbb3b)

Author SHA1 Message Date
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
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
yflory 620f4dc512 Add translations for the markdown preview button title 2017-05-18 15:05:37 +02:00
yflory 51bd41d4e8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 14:57:12 +02:00
yflory 0bd4caeb7e Add the task list code to the markdown renderer 2017-05-18 14:57:04 +02:00
ansuz d187945e94 jshint compliance 2017-05-18 14:55:16 +02:00
ansuz 3ba94a1ba2 correctly set release version number 2017-05-18 14:54:02 +02:00
yflory 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 14:27:10 +02:00
yflory d13dde856a Add the markdown renderer file and change code's default content 2017-05-18 14:26:56 +02:00
ansuz 4debec39bb update footer with next release codename and corrected matrix link 2017-05-18 12:58:49 +02:00
ansuz 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 12:46:36 +02:00
ansuz 80479fdc90 use rpc calls from cryptpad common 2017-05-18 12:44:16 +02:00
ansuz 7befaccd88 move more rpc calls into pinpad 2017-05-18 12:36:12 +02:00
yflory 56bcdff890 Add a preview of the markdown content in the code editor 2017-05-18 12:16:26 +02:00
yflory b72415b56b Fix old hashes not working with the new parser 2017-05-18 10:13:08 +02:00
yflory 6b7aeb9121 Fix the text example 2017-05-17 15:48:09 +02:00
yflory fe0f21594a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-16 14:41:51 +02:00
yflory 953e7155f0 Send only the hostname to the accounts server 2017-05-16 14:41:40 +02:00
ansuz afef456b18 fix undefined reference 2017-05-16 14:15:42 +02:00
ansuz 8fe0282b7b jshint compliance 2017-05-16 14:14:30 +02:00
ansuz 827233dcba new translation keys for file upload 2017-05-16 14:01:06 +02:00