Commit graph

1721 commits

Author SHA1 Message Date
ansuz
3915b30055 provide a register button on login
also direct users from file to login
2017-05-29 13:11:07 +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
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