a5cb5f2ceb
Merge branch 'staging' into newDrive
8 years ago
b36484931d
Lint
8 years ago
23318357a6
make fewer RPC calls for usageBar
8 years ago
df586a223c
update limits, usage, plan, and note whenever they are checked
8 years ago
78e6118153
Merge branch 'staging' into newDrive
8 years ago
c4e5741ae0
update upgrade button logic
8 years ago
f1a9002417
use upgradeURL with usage bar
8 years ago
b0fe04381d
Merge branch 'staging' into newDrive
8 years ago
1c2ea04f11
Drive refactoring
8 years ago
ac91d2f413
Fix the upgrade and donate buttons in the home page
8 years ago
ee57458158
Remove the pin limit alert
8 years ago
7b94106bac
fix inverted conditional :/
8 years ago
2e03485db4
remove known bad entries from localStorage.userHash...
8 years ago
936bf8df9d
return falsey if userHash is junk
8 years ago
105e5cdac9
fix 'undefined/' userHash
8 years ago
ebfa228bc0
add upgrade button to all static pages
8 years ago
9ca5bc507e
add support for donate button
8 years ago
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
8 years ago
fd83ae3e61
implement createRandomInteger
8 years ago
dc80b6b11f
throttle markdown preview
8 years ago
e6c04ccb49
bump server after paying for an account
8 years ago
6324d9bbb0
feedback on template feature usage
8 years ago
c3437382fb
Fix the release version in the what's new popup
8 years ago
d55b7e411c
Display an alert in the drive when the limit is reached
8 years ago
ba5ef5157e
show pretty representations of storage usage
8 years ago
d014fccfce
Fix lint error
8 years ago
2082b328b4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
814c81fb13
Display an alert when CryptPad has a new version
8 years ago
164342920e
fix inverted condition
8 years ago
7befaccd88
move more rpc calls into pinpad
8 years ago
fe0f21594a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
953e7155f0
Send only the hostname to the accounts server
8 years ago
afef456b18
fix undefined reference
8 years ago
87fa28180a
Display an upgrade button in the settings page
8 years ago
c1b43db363
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1542aa96bc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
dc2cdb7c08
Add the usage bar in the settings page
8 years ago
2dd04f7631
get limits from the server
8 years ago
771348720b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
57979f6314
Display the public key using a href in the settings page
8 years ago
06f3d0eefe
shim isArray if not exists. correctly report how often this occurs
8 years ago
601226115b
New anonymous drive
8 years ago
ed95bbb08f
Fix lint errors
8 years ago
89a993be3c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0f13198119
Move the parseHash code into parsePadUrl
8 years ago
57ee7de7d4
Update and return the storage limit
8 years ago
5c8586f8a3
Fix typo in file upload
8 years ago
a338b23f40
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
df47b913e3
fetch array buffers in cryptpad-common
8 years ago
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
8 years ago
63710e1ccc
Move the code related to the title in another file
8 years ago
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6847906ac9
Move the userlist code in a separate file
8 years ago
a173e4c7a0
add 'log out everywhere' functionality in settings
8 years ago
5a5b02b82b
Don't store in the drive pads without a hash
8 years ago
78b11584f8
remove unused variables
8 years ago
410a9dfb17
temporary solution for testing pin limits
8 years ago
ef89451a83
Display the storage limit in the drive
8 years ago
afb0061d7b
Fix an issue with anonymous user unable to store new pads
8 years ago
a51a35da70
Fix an issue with hashes ending with a slash
8 years ago
0ef1c14d7f
Fix lint errors
8 years ago
fc760b4820
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
e51c7f9cf0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
aedc46bdaf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a97e7223f1
implement getBlobPathFromHex
8 years ago
520dabe094
Remove the unsorted files category
8 years ago
12898b3358
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
74bcec8b31
programming is hard okay
8 years ago
2a417ddae8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d985b144cc
Add a new hash version for the file viewer
8 years ago
3309087277
send feedback if isArray is not supported
8 years ago
4fdc5f897e
only feedback migration if user had legacy store
8 years ago
218f2ff76c
feedback when logging in or registering
8 years ago
f7e96b4e8c
resolve merge conflicts and jquery errors
8 years ago
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
8 years ago
92ea03d7d9
View and restore the history of a pad
8 years ago
4c0d7bf8e8
support multiple calls to cryptpad.ready
8 years ago
ec041c88e2
console.log when providing feedback
...
also notify server if a users browser does not support proxies
8 years ago
3afaf029cb
feedback about how often we migrate an old drive
8 years ago
347459781c
show the size of your files, if you're logged in
8 years ago
2b8579e8b7
add pretty-printers for byte-counts
8 years ago
2a25afae5f
Merge branch 'soon' into staging
8 years ago
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
8 years ago
da69c1822c
ask users to sign back if signing keys are missing
8 years ago
821c1a3ec6
annotate code which we hope to be able to deprecate in the future
8 years ago
43c045721c
Get the channel history
8 years ago
c7eae9675b
keep exporting isArray for backwards compatibility
...
but prevent internal use
8 years ago
fbebbf0dca
minor clean up
8 years ago
525d35c9ec
redefine alert
8 years ago
f694a81a5c
move more interface code out of cryptpad-common
8 years ago
a4157b9908
remove more unused functions
8 years ago
e10901edb2
begin to move interface code out of cryptpad-common
8 years ago
95789d3cbe
expose rpc for pinned usage
8 years ago
8f4dbcf4c6
remove getPadTitle
8 years ago
f42da4ecd8
move hashChannelList into common-hash.js
8 years ago
63960bd38c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
520ae822fc
correct undefined reference
8 years ago
633d60ccd0
Remove a TODO
8 years ago
81d83897ec
Rename hash.js
8 years ago
607d9652f5
jshint compliance
8 years ago
3ba90332bb
Merge branch 'refactor' into staging
8 years ago
daabb0b3ad
Integrate and fix the new fileObject (userObject)
8 years ago
df4a250359
use feedback api instead of app=
8 years ago
e618483395
extract all code for encoding and decoding hashes
8 years ago
fdd2716ad5
move constants to the top of cryptpad-common.js
8 years ago
c1e0316d43
Refactor fileObject
8 years ago
5212539a16
move standalone functions from common into their own file
8 years ago
7437d6b902
remove unused function
8 years ago
cde724399c
Pin the pads
8 years ago
2c8d1b8183
jshint compliance
8 years ago
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a14bb1480a
progress for implicit pinning
8 years ago
cfc5d634f4
Merge branch 'templates' into staging
8 years ago
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
8 years ago
84d8615cf1
Save and use templates in pad, code and slides
8 years ago
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
8 years ago
abd87e1322
jshint compliance
8 years ago
e4b15bc616
implement 'getCanonicalChannelList'
8 years ago
fdede0d1fd
remove some dead code
8 years ago
a8ffac5dcd
Remove old code
8 years ago
40f5e1706f
add a unique id to user objects, define a getter
8 years ago
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
8 years ago
7afde2309d
Add properties to the files not in the trash
8 years ago
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
98027dad27
jshint compliance
8 years ago
26edb77cf0
Fix style and usability issues in slides
8 years ago
d422c7e165
support old hashes in getUserChannelList
8 years ago
d85a42c776
include User_hash in user channel list
8 years ago
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d19bbcb001
Add support for search in the drive
8 years ago
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
298725b3c2
don't show usage tips on error screens
8 years ago
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
8 years ago
15a67afc75
jshint compliance
8 years ago
7187d3c550
implement getUserChannelList
8 years ago
f10149db1c
Make sure the tip is always visible when the loading screen is removed
8 years ago
413d9a6f0b
add a style-callback to confirm
8 years ago
803e57c958
add more parameters to confirm dialogs
8 years ago
f2aa531f27
apply styles to confirm buttons if provided
8 years ago
b7986ff6b1
Replace the spinner code with a font awesome spinner
8 years ago
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
8 years ago
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
8 years ago
4206382865
Fix the settings app to allow backup for unregistered users
8 years ago
d93a270336
Ability to display tips in the loading screen
8 years ago
cb88227e2b
Autocomplete on key press in some dropdown menus
8 years ago
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
8 years ago
e1303a16da
add support for title attributes on dropdowns
8 years ago
01c4d7d4a7
Merge branch 'maybe' into staging
8 years ago
c884782d57
here are some changes
8 years ago
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
8 years ago
c5f983ecd7
Convert read-only link to editing link in the drive
8 years ago
a9afa24428
return empty string instead of blowing up when fixing HTML
8 years ago
8bdc8415ab
Find a pad in the drive
8 years ago
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.
8 years ago
7db0e14bc0
add 'force' flag to override removal of html elements
8 years ago
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
8 years ago
2c5c6da0d9
Fix XSS in alertify logs
8 years ago
26e3971482
Fix XSS in the user dropdown menu
8 years ago
5d39125004
Make onSettle Async Again
8 years ago
4f4075ed6e
Make the settings app available to anonymous users
8 years ago
12aec60a12
hack around onSettle not doing its job
8 years ago
1a259bb3aa
check if user has disallowed feedback api
8 years ago
de5a21fe57
add a simple feedback api and text explaining what it is
8 years ago
5303e76ece
Make sure the content is correctly applied in onReady
8 years ago
42b6cca18d
Fix new pad not working
8 years ago
3fd5669647
Hide the trash icon for read-only pads if we have the edit link in drive
8 years ago
e15a6a347f
Fix the forget pad button
8 years ago
54b0a86c2e
Make sure we redirect to the drive if we access the login page from the homepage
8 years ago
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
8 years ago
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
8 years ago
c72bbd4c37
Use the file name as initial title
8 years ago
47b8fefd9e
Load messages.js only once, in cryptpad-common
8 years ago
d81d17b86c
Remove old translations keys no longer used
8 years ago
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
8 years ago
94417d9a8b
jshint compliance
8 years ago
09fade6127
add cache-busting to chainpad-crypto
8 years ago
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
8 years ago
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
8 years ago
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
8 years ago
7758d056fa
Ability to import/export a user realtime object
8 years ago
92050eb04f
Fix the trash button in toolbar not always working
8 years ago
aae3fba284
Fix the storage when the hash is invalid
8 years ago
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
3aa03225c9
Add a spinner when hashing the password and translate homepage
8 years ago
f723585758
add api to check whether the realtime has synced with the server
8 years ago
1232aa8a79
jshint compliance
8 years ago
8eec7ec7c8
Fix typo
8 years ago
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
8 years ago
914c442615
Do not redirect to home page when logging out from another tab
8 years ago
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1e2cc6bea4
Fix race condition with the iframe store
8 years ago
6e97082ff9
remove dead code from login function
8 years ago
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6f07a3b7b4
erase lingering sessionStorage values when logging out
8 years ago
9f1789b2d2
Fix creation of pads from non-root category in the drive
8 years ago
87abfac5e0
Fix lint error
8 years ago
b0fb56fa63
Allow logge din users to access the home page
8 years ago
757ae7a3ad
Fix a cross origin frame issue with dropdowns
8 years ago
39c85ca3f7
Fix race condition causing missing translations in homepage
8 years ago
5e69b78334
Remove the domain from the href in store
8 years ago
5ef074370b
Name a place before creating it in the drive
8 years ago
0e9e0e545f
Load the new pad when the hash is changed
8 years ago
3f44444f41
Display the 'New' button in the trash
8 years ago
11f0a9ae5f
Revert the changes adding anonymous pads
8 years ago
f42665ba49
Remove the unowned pads category
8 years ago
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
8 years ago
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
8 years ago
88021f2264
Anonymous pads fo anonymous users
8 years ago
2afdc11327
Replace the username button by a dropdown menu
8 years ago
4adde0f0c0
Use the new dropdown for userlist and share
8 years ago
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
8 years ago
3f1e287811
Fix an issue causing a user object to be turned into a pad
8 years ago
4278ac7637
Merge branch 'soon' into fileManager
8 years ago
1c3f1a15cd
make sure that /pad is resized after loading
8 years ago
1e70af0c16
Use the same network for the apps and the file store
8 years ago
5cd714b18a
configure filestore usage via customize/application_config.js
8 years ago
91a806ab86
focus on OK button when we pop an alert
8 years ago
89e5830409
make alertify display time configurable
8 years ago
5e1d8292c5
guard against trying to parse special fragments
8 years ago
52a593c2c2
fix jshint complaints
8 years ago
53a4d4738a
really make sure you're logged out
8 years ago
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
9b6c9e3891
Add support for templates in the file manager
8 years ago
87abfff66b
Fix Flash Of Unstyled Content (fouc)
8 years ago
1682d23c1c
remove old user prototype
8 years ago
c359c27997
Use user object as default store in file manager
8 years ago
bd6992da0a
create a random hash
8 years ago
2cd50498c2
add log(in|out) functions to common
8 years ago
7df460c766
implement createChannelId api
8 years ago
5a14db9f07
Merge branch 'test-filemanager' into login
8 years ago
5bc7766f44
Use a consistent toolbar across all apps
8 years ago
2968488278
convert uint8 arrays to hex
8 years ago
8e6830d080
Fix file manager with a chosen hash
8 years ago
ee56f5608f
Fix the infinite spinner bug with the file manager store
8 years ago
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
8 years ago
05fd6c1563
Fix the infinite spinner problem
8 years ago
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
8 years ago
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
8 years ago
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
8 years ago
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
8 years ago
a957b72598
Create a new pad from the file manager
8 years ago
d6e1215166
Refresh the directory if needed when the object has changed
8 years ago
118829617f
Use the FS store as default store
8 years ago
c2770a7a74
set correct hash even if browser does not implement replaceState
8 years ago
303c65f2c3
use replaceState if available, instead of setting the hash
8 years ago
2d5448458b
export messages
8 years ago
d512b113cd
address failure to parse url when hash is not present
8 years ago
3d74290c7d
Merge branch 'usability5' into staging
8 years ago
9e92a597b3
Ability to edit the title in the toolbar by clicking it
8 years ago
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
8 years ago
10bb5e1607
Add the title in the toolbar
8 years ago
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
8 years ago
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
8 years ago
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
8 years ago
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
8 years ago
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
8 years ago
765498e88e
Remove the support for old.cryptpad.fr
8 years ago
c322aa440e
Fix the username icon hcih was not working anymore
8 years ago
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
8 years ago
a989b51d74
Fix race conditions with Alertify
8 years ago
74df38f94f
Fix race conditions that could prevent applications from being loaded
8 years ago
dbc8f01b8b
fix merge errors and reach full jshint compliance
8 years ago
a30e17121d
Merge branch 'readonlyButton' into soon
8 years ago
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
8 years ago
2ac1b02572
Merge branch 'config-sockets' into soon
8 years ago
3dfa19b786
more flexible websocket configuration (WIP)
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
17b4f91810
Do not share the title in the doc if it is the default title
8 years ago
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
8 years ago
2609af2105
Use the CodeMirror editor in the slide application
8 years ago
3d54413343
Improve the UI with FontAwesome icons
8 years ago
d6525087c7
jshint compliancy
8 years ago
79884e2400
Use the same username for all pads
8 years ago
dde519795d
Merge branch 'newhash' into newhashNoConflict
8 years ago
83705ae058
Improve the UI in read-only mode
8 years ago
fa8199bc75
don't try to use experimental user code
8 years ago
42f14873cd
Merge branch 'translations' into newhashmerge
8 years ago
368e253c9f
Ability to send a read-only URL
8 years ago
5c63585952
Complete the French translation
8 years ago
0d9f63b977
Merge branch 'translations' - part one
8 years ago
f086492e50
Improve the localization system
...
Improve and enable the French translation
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
c736caceba
Use a better default pad title
8 years ago
4941c1493e
better user integration. a few more common utils
8 years ago
30ea1b59b7
integrate users into common utilities
8 years ago
6d775f61c6
add missing functions
8 years ago
1bec02239c
coerce dates into strings
8 years ago
8c914dfe1f
better filenames
8 years ago
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
8 years ago
5131f47cca
jshint compliance
8 years ago
306d524416
fix broken removal call
8 years ago
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
8 years ago
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
8 years ago
dcc9810a42
avoid extra call to store if there are no keys to remove
8 years ago
9a5294016d
fix incorrect usage of store api
8 years ago
4e5f381325
add spinner to API. update bower deps
9 years ago
fa654a7646
slightly better regex
9 years ago
cd18075ac7
add some redirection logic to support old hash types
9 years ago
600f3151e9
don't use the store until it's ready to be used
9 years ago
551d38c930
let the abstraction take care of stringification
9 years ago
0ada6a3d0a
jshint compliance. gotta keep those tests green
9 years ago
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
9 years ago
42eafe9e29
don't create duplicate stylesheets in the document head
9 years ago
c6bdb7506d
forget everything about a pad when you forget it
9 years ago
e84fbf0bc3
more helpers in common
9 years ago
ff74a67a09
translate alertify button messages
9 years ago
3eccec7054
better effort for translation
9 years ago
7504f79e05
add log and warn methods to cryptpad common
9 years ago
589b0087a1
listen for keyup events while alertify prompts are active
9 years ago
3d3c6e4800
add wrappers for alertifyjs
9 years ago
d8b467422a
fix default title in localStorage migration
9 years ago
7a5877d12a
don't filter pads after 30 days
9 years ago
8a82e11306
make sure title is defined for home page usage
9 years ago
71b1f71ba0
fix migration to include ctime
9 years ago
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
9 years ago
93dcf29c15
more functions for working with localstorage
9 years ago
d025d13295
address some jshint complaints
9 years ago
ca45e3533d
pass loaded file to callback when importing
9 years ago
31aa09d6f6
work a bit more on import/export and code highlighting
9 years ago
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
9 years ago
1746a4e732
use crypto from bower
9 years ago
a0c73c95d8
do away with a bit of boilerplate
9 years ago
yflory