ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
2017-04-27 12:47:21 +02:00 |
|
yflory
|
520dabe094
|
Remove the unsorted files category
|
2017-04-26 18:46:40 +02:00 |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
2017-04-26 14:55:06 +02:00 |
|
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:42:33 +02:00 |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
2017-04-25 18:42:21 +02:00 |
|
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:28:48 +02:00 |
|
ansuz
|
74bcec8b31
|
programming is hard okay
|
2017-04-25 18:28:39 +02:00 |
|
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 17:22:07 +02:00 |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
2017-04-25 17:19:13 +02:00 |
|
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
2017-04-25 17:09:39 +02:00 |
|
ansuz
|
f196b836db
|
fix undefined reference
|
2017-04-25 16:17:52 +02:00 |
|
ansuz
|
48973bccd6
|
add tests to assert for hash parsing
|
2017-04-25 16:11:19 +02:00 |
|
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 14:57:34 +02:00 |
|
yflory
|
c9c7d61ad1
|
Media tag viewer
|
2017-04-25 14:55:38 +02:00 |
|
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
2017-04-25 14:35:24 +02:00 |
|
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
2017-04-25 14:33:57 +02:00 |
|
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
2017-04-24 17:13:32 +02:00 |
|
ansuz
|
cc33c4abe9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-24 15:41:46 +02:00 |
|
ansuz
|
a5ca461a73
|
update footer for new version
|
2017-04-24 15:41:29 +02:00 |
|
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
2017-04-24 15:38:03 +02:00 |
|
ansuz
|
4b95a1da48
|
unbreak assert/translations
|
2017-04-24 14:32:56 +02:00 |
|
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
2017-04-24 14:26:55 +02:00 |
|
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
2017-04-24 14:15:17 +02:00 |
|
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
2017-04-24 13:55:03 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
2017-04-24 11:41:00 +02:00 |
|
ansuz
|
18e2e66b06
|
jshint compliance
|
2017-04-24 11:39:39 +02:00 |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
2017-04-21 17:31:47 +02:00 |
|
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
2017-04-21 16:51:32 +02:00 |
|
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
2017-04-21 15:53:13 +02:00 |
|
ansuz
|
c51073f211
|
support batch getFileSize calls
|
2017-04-21 14:51:20 +02:00 |
|
ansuz
|
1af621bfe5
|
Merge remote-tracking branch 'origin/auth' into staging
|
2017-04-20 17:27:32 +02:00 |
|
ansuz
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
2017-04-20 17:06:09 +02:00 |
|
Caleb James DeLisle
|
0e8b55edc0
|
Added an authentication page to allow getting the user pubkey
|
2017-04-20 10:15:07 +02:00 |
|
ansuz
|
df9c312b7d
|
make new text translateable
|
2017-04-18 18:31:58 +02:00 |
|
ansuz
|
e8b053e48b
|
use bootloader in feedback.html
|
2017-04-18 17:31:35 +02:00 |
|
ansuz
|
a6dbfcecf3
|
remove old/unused assertions
|
2017-04-18 17:28:09 +02:00 |
|
ansuz
|
b658bda421
|
use bootloader to fix paths to jquery and json.sortify
|
2017-04-18 17:24:46 +02:00 |
|
ansuz
|
347459781c
|
show the size of your files, if you're logged in
|
2017-04-18 15:49:04 +02:00 |
|
ansuz
|
2b8579e8b7
|
add pretty-printers for byte-counts
|
2017-04-18 15:44:15 +02:00 |
|
ansuz
|
2a25afae5f
|
Merge branch 'soon' into staging
|
2017-04-18 12:24:45 +02:00 |
|
ansuz
|
e0ecf651e2
|
add a note about showing pinned file usage
|
2017-04-18 12:23:58 +02:00 |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
2017-04-18 12:14:32 +02:00 |
|
ansuz
|
da69c1822c
|
ask users to sign back if signing keys are missing
|
2017-04-18 11:58:41 +02:00 |
|
ansuz
|
107e75b287
|
remove invalid semicolon
|
2017-04-14 19:24:20 +02:00 |
|
ansuz
|
821c1a3ec6
|
annotate code which we hope to be able to deprecate in the future
|
2017-04-14 18:44:08 +02:00 |
|
yflory
|
43c045721c
|
Get the channel history
|
2017-04-14 18:36:36 +02:00 |
|
ansuz
|
f6d6f81d55
|
send feedback when a user registers
|
2017-04-14 18:21:11 +02:00 |
|
ansuz
|
deeb47c40b
|
reportAppUsage for settings
|
2017-04-14 18:19:04 +02:00 |
|
ansuz
|
5a83759ee2
|
add usage button to settings page
|
2017-04-14 17:18:17 +02:00 |
|
ansuz
|
a27cc76fc0
|
uppercase LOL
|
2017-04-14 15:35:02 +02:00 |
|
ansuz
|
402ce2db93
|
better validation of inputs
|
2017-04-14 15:34:22 +02:00 |
|
ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
2017-04-14 15:34:05 +02:00 |
|
ansuz
|
fbebbf0dca
|
minor clean up
|
2017-04-14 15:32:12 +02:00 |
|
ansuz
|
525d35c9ec
|
redefine alert
|
2017-04-14 14:54:43 +02:00 |
|
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
2017-04-14 12:25:32 +02:00 |
|
ansuz
|
a4157b9908
|
remove more unused functions
|
2017-04-14 12:14:10 +02:00 |
|
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
2017-04-14 12:09:00 +02:00 |
|
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
2017-04-14 11:41:51 +02:00 |
|
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
2017-04-14 11:41:18 +02:00 |
|
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
2017-04-14 11:40:28 +02:00 |
|
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 19:47:04 +02:00 |
|
ansuz
|
520ae822fc
|
correct undefined reference
|
2017-04-13 19:46:52 +02:00 |
|
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
2017-04-13 19:46:38 +02:00 |
|
ansuz
|
bf047fcf65
|
Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
|
2017-04-13 19:43:30 +02:00 |
|
Pierre Bondoerffer
|
96ff487271
|
fix flash of content
|
2017-04-13 19:36:04 +02:00 |
|
ansuz
|
5a7eea08c8
|
Merge pull request #108 from pbondoer/newpoll
Poll fixes
|
2017-04-13 18:04:13 +02:00 |
|
Pierre Bondoerffer
|
248f88034b
|
important fixes
|
2017-04-13 17:56:28 +02:00 |
|
yflory
|
633d60ccd0
|
Remove a TODO
|
2017-04-13 17:19:32 +02:00 |
|
Pierre Bondoerffer
|
6b57bb2bbb
|
poll: press enter to validate input
|
2017-04-13 17:09:31 +02:00 |
|
Pierre Bondoerffer
|
d483e10e77
|
poll fixes
|
2017-04-13 17:07:09 +02:00 |
|
yflory
|
81d83897ec
|
Rename hash.js
|
2017-04-13 17:04:15 +02:00 |
|
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
2017-04-13 16:43:07 +02:00 |
|
Pierre Bondoerffer
|
ea5301be13
|
poll improved(tm)
|
2017-04-13 16:31:57 +02:00 |
|
Pierre Bondoerffer
|
7434dbcb0f
|
what i have
|
2017-04-13 15:27:37 +02:00 |
|
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 15:04:23 +02:00 |
|
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
2017-04-13 15:04:17 +02:00 |
|
ansuz
|
607d9652f5
|
jshint compliance
|
2017-04-13 14:48:15 +02:00 |
|
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
2017-04-13 14:44:55 +02:00 |
|
Pierre Bondoerffer
|
f11cf8e6ac
|
move poll styles to separate file
|
2017-04-13 14:14:12 +02:00 |
|
yflory
|
daabb0b3ad
|
Integrate and fix the new fileObject (userObject)
|
2017-04-13 14:06:40 +02:00 |
|
ansuz
|
df4a250359
|
use feedback api instead of app=
|
2017-04-13 12:18:08 +02:00 |
|
ansuz
|
86c37bfa37
|
fix find+replace error
|
2017-04-13 11:11:45 +02:00 |
|
ansuz
|
e618483395
|
extract all code for encoding and decoding hashes
|
2017-04-13 11:05:28 +02:00 |
|
ansuz
|
fdd2716ad5
|
move constants to the top of cryptpad-common.js
|
2017-04-13 10:31:08 +02:00 |
|
yflory
|
c1e0316d43
|
Refactor fileObject
|
2017-04-12 18:54:22 +02:00 |
|
ansuz
|
5212539a16
|
move standalone functions from common into their own file
|
2017-04-12 17:54:44 +02:00 |
|
ansuz
|
7437d6b902
|
remove unused function
|
2017-04-12 17:09:42 +02:00 |
|
ansuz
|
4e590a9dd1
|
remove even more dead code
|
2017-04-12 16:16:58 +02:00 |
|
ansuz
|
85fcaa9bbc
|
remove more dead code
|
2017-04-12 16:13:25 +02:00 |
|
ansuz
|
401936a91e
|
move singly-used css file out of /common/
|
2017-04-12 16:09:05 +02:00 |
|
ansuz
|
9a46b58c85
|
deprecate this 90 days after f-release
|
2017-04-12 16:03:41 +02:00 |
|
ansuz
|
7a59183bb1
|
pinpad.create should always be async
|
2017-04-12 16:02:42 +02:00 |
|
ansuz
|
8de3610532
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-12 16:02:09 +02:00 |
|
ansuz
|
9aa0548b1f
|
remove dead cursor code
|
2017-04-12 15:59:30 +02:00 |
|
yflory
|
4e61b79f9a
|
Clean fileObject
|
2017-04-11 15:11:33 +02:00 |
|
yflory
|
cde724399c
|
Pin the pads
|
2017-04-11 14:53:44 +02:00 |
|
yflory
|
74ea2fce5a
|
Fix lint error...
|
2017-04-10 19:18:46 +02:00 |
|
yflory
|
aa49c97d6e
|
Fix lint error
|
2017-04-10 19:13:36 +02:00 |
|
ansuz
|
2c8d1b8183
|
jshint compliance
|
2017-04-10 19:12:22 +02:00 |
|