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
|
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 |
|
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 |