blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1658 commits 72 branches 132 tags 541 MiB
Commit graph

457 commits

Author SHA1 Message Date
yflory
51a79c5218 Remove unused dependency 2016-10-18 13:38:48 +02:00
yflory
9a733bb360 Fix dropdown menus with Edge 2016-10-13 15:00:53 +02:00
yflory
39bbf8a6c1 Fix the new userlist button and make the toolbar responsive 2016-10-13 14:24:59 +02:00
yflory
24fbe22c9d Improve the toolbar style and the way the userlist is displayed 2016-10-12 18:40:26 +02:00
yflory
d2389a5729 Change the userlist in the toolbar 2016-10-11 18:39:43 +02:00
yflory
91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 2016-10-10 17:07:50 +02:00
ansuz
bb2317d8e6 fix chrome style bug by forcing reload of style sheet 2016-10-07 17:41:52 +02:00
yflory
765498e88e Remove the support for old.cryptpad.fr 2016-10-07 10:39:48 +02:00
yflory
c322aa440e Fix the username icon hcih was not working anymore 2016-10-05 18:19:52 +02:00
yflory
8575f3f79f Fix the "rename" feature which was not working anymore in some cases 2016-10-05 17:22:56 +02:00
yflory
a989b51d74 Fix race conditions with Alertify 2016-10-05 16:04:21 +02:00
yflory
74df38f94f Fix race conditions that could prevent applications from being loaded 2016-10-05 11:19:18 +02:00
ansuz
dbc8f01b8b fix merge errors and reach full jshint compliance 2016-10-04 16:58:10 +02:00
yflory
a30e17121d Merge branch 'readonlyButton' into soon 2016-10-04 15:48:52 +02:00
yflory
e84a54556c Move the toolbar buttons' events handlers in cryptpad-common 2016-10-04 15:44:12 +02:00
ansuz
2ac1b02572 Merge branch 'config-sockets' into soon 2016-10-04 14:38:50 +02:00
ansuz
3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
yflory
76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +02:00
yflory
17b4f91810 Do not share the title in the doc if it is the default title 2016-10-03 16:05:39 +02:00
yflory
391728ee6d Use CodeMirror in /slide #2 
Fix title errors in the slide app caused by the present mode
 2016-10-03 14:21:39 +02:00
yflory
8c33218ceb Move the codemirror themes in /common 2016-10-03 14:19:37 +02:00
Yann Flory
2609af2105 Use the CodeMirror editor in the slide application 2016-09-30 17:39:16 +02:00
yflory
f03018f3bc Improve the top bar and use the font awesome icons in /code 2016-09-28 15:28:25 +02:00
yflory
3d54413343 Improve the UI with FontAwesome icons 2016-09-27 18:33:03 +02:00
ansuz
d6525087c7 jshint compliancy 2016-09-23 17:53:24 +02:00
yflory
d46bd1af5c Improve the toolbar UI with the username displayed 2016-09-22 17:56:51 +02:00
yflory
79884e2400 Use the same username for all pads 2016-09-22 17:12:46 +02:00
yflory
dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
ansuz
f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
yflory
83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz
fa8199bc75 don't try to use experimental user code 2016-09-20 16:22:00 +02:00
Yann Flory
99b50465c7 Add the read-only mode for /pad and /code 2016-09-19 17:52:37 +02:00
Yann Flory
42f14873cd Merge branch 'translations' into newhashmerge 2016-09-19 14:53:40 +02:00
Yann Flory
391b7690e6 Set the pad to readonly mode when using a 'view' url 2016-09-19 14:52:36 +02:00
Yann Flory
368e253c9f Ability to send a read-only URL 2016-09-16 18:45:40 +02:00
yflory
5c63585952 Complete the French translation 2016-09-15 18:35:09 +02:00
yflory
0d9f63b977 Merge branch 'translations' - part one 2016-09-15 10:36:05 +02:00
yflory
f086492e50 Improve the localization system 
Improve and enable the French translation
 2016-09-14 18:08:52 +02:00
yflory
25c8d16bf5 Use a new version-prefixed hash parser 2016-09-13 17:43:56 +02:00
yflory
c736caceba Use a better default pad title 2016-09-13 12:24:06 +02:00
ansuz
97415d8158 Merge branch 'users' 2016-09-01 17:38:25 +02:00
ansuz
8e86be81b2 Merge branch 'better-slides' 2016-09-01 16:01:21 +02:00
ansuz
fb21b4e46b fix up /render/ 2016-09-01 15:54:21 +02:00
ansuz
4941c1493e better user integration. a few more common utils 2016-09-01 12:15:30 +02:00
ansuz
30ea1b59b7 integrate users into common utilities 2016-08-30 18:09:53 +02:00
ansuz
6d775f61c6 add missing functions 2016-08-30 10:06:14 +02:00
ansuz
168338b898 add missing functions 2016-08-29 18:10:15 +02:00
ansuz
f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad 2016-08-25 17:59:37 +02:00
ansuz
f40b798d88 Merge pull request #30 from xwiki-labs/reconnect 
Ability to reconnect after a connection failure
 2016-08-25 17:57:45 +02:00
yflory
c168ce2d1c Ability to reconnect after a connection failure 2016-08-25 17:56:17 +02:00
ansuz
1bec02239c coerce dates into strings 2016-08-25 11:19:09 +02:00
ansuz
0add01a940 remove dead code 2016-08-25 11:08:15 +02:00
ansuz
8c914dfe1f better filenames 2016-08-19 10:47:07 +02:00
ansuz
7eaa4ce733 recognize pads with the same type and hash as identical no matter their domain 2016-08-05 17:17:49 +02:00
ansuz
5131f47cca jshint compliance 2016-08-03 17:03:50 +02:00
ansuz
306d524416 fix broken removal call 2016-08-03 16:53:41 +02:00
ansuz
dd3a5d47be migrate localStorage so people go to cryptpad.fr 2016-08-03 11:08:45 +02:00
ansuz
a094e3c02e use correct store api calls in frame.js 
also don't log unnecessarily
 2016-08-03 11:02:40 +02:00
ansuz
dcc9810a42 avoid extra call to store if there are no keys to remove 2016-08-03 09:42:49 +02:00
ansuz
9a5294016d fix incorrect usage of store api 2016-08-03 09:35:16 +02:00
ansuz
4e5f381325 add spinner to API. update bower deps 2016-08-02 18:56:35 +02:00
ansuz
fa654a7646 slightly better regex 2016-08-02 17:08:46 +02:00
ansuz
cd18075ac7 add some redirection logic to support old hash types 2016-08-02 15:17:20 +02:00
ansuz
600f3151e9 don't use the store until it's ready to be used 2016-08-02 12:11:40 +02:00
ansuz
fffa9acf15 remove unused files from fs and jshintignore 2016-08-02 11:59:54 +02:00
ansuz
551d38c930 let the abstraction take care of stringification 2016-07-29 18:05:58 +02:00
ansuz
0ada6a3d0a jshint compliance. gotta keep those tests green 2016-07-28 17:52:26 +02:00
ansuz
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
 2016-07-28 17:44:40 +02:00
ansuz
7f02c899ea add snippet for copying text to the clipboard 2016-07-28 10:08:51 +02:00
ansuz
42eafe9e29 don't create duplicate stylesheets in the document head 2016-07-25 15:39:54 +02:00
ansuz
c6bdb7506d forget everything about a pad when you forget it 2016-07-22 15:18:09 +02:00
ansuz
e84fbf0bc3 more helpers in common 2016-07-22 12:24:54 +02:00
ansuz
ff74a67a09 translate alertify button messages 2016-07-12 16:43:33 +02:00
ansuz
d39ab5c250 point to the actual translation file 2016-07-12 15:52:36 +02:00
ansuz
dea8e225db fix double scrollbar issue 2016-07-12 15:45:49 +02:00
ansuz
3eccec7054 better effort for translation 2016-07-11 17:36:53 +02:00
ansuz
cbeaa8d609 major refactoring for toolbar. CAN HAZ LESS 2016-07-08 16:45:48 +02:00
ansuz
7504f79e05 add log and warn methods to cryptpad common 2016-07-08 16:45:15 +02:00
ansuz
3ad5d71ab1 make sure the regular favicon is set 2016-07-07 13:43:08 +02:00
ansuz
fd3cd73d0b try to fix favicon bug 2016-07-07 13:40:03 +02:00
ansuz
589b0087a1 listen for keyup events while alertify prompts are active 2016-07-07 13:27:45 +02:00
ansuz
deae7ac78f don't hide the notification until it has been seen 2016-07-07 10:45:09 +02:00
ansuz
3d3c6e4800 add wrappers for alertifyjs 2016-07-06 22:20:15 +02:00
ansuz
73d2b6561a add small modules for page visibility api and notification apis 2016-07-06 22:16:17 +02:00
ansuz
d8b467422a fix default title in localStorage migration 2016-07-04 16:43:39 +02:00
ansuz
7a5877d12a don't filter pads after 30 days 2016-07-04 15:34:43 +02:00
ansuz
d844551fba add a forget button. clean up toolbar a bit 2016-06-30 17:24:25 +02:00
ansuz
8a82e11306 make sure title is defined for home page usage 2016-06-30 15:53:13 +02:00
ansuz
71b1f71ba0 fix migration to include ctime 2016-06-30 15:15:38 +02:00
ansuz
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
 2016-06-30 15:10:32 +02:00
ansuz
a3da10766a add rename button to /code/ and /pad/ 2016-06-30 10:51:19 +02:00
ansuz
93dcf29c15 more functions for working with localstorage 2016-06-30 10:43:56 +02:00
ansuz
d025d13295 address some jshint complaints 2016-06-23 16:44:20 +02:00
ansuz
12bbf3e8f6 don't drop values onto the window 2016-06-23 16:38:40 +02:00
ansuz
ca45e3533d pass loaded file to callback when importing 2016-06-23 16:38:24 +02:00
ansuz
1a5905d9fd more work on highlighting modes in codemirror 
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
 2016-06-23 12:07:51 +02:00
ansuz
31aa09d6f6 work a bit more on import/export and code highlighting 2016-06-22 20:58:50 +02:00
ansuz
242c9a99e3 implement import and export in /pad/ 2016-06-22 17:00:07 +02:00
ansuz
0a8137e7eb move rememberPad to cryptpad common and simplify it a bit 2016-06-21 18:46:19 +02:00
ansuz
c3d2568d3c add file export for codepad 
addresses #24
 2016-06-17 10:59:45 +02:00
ansuz
2b8c21d292 set styles with setAttribute. fixes style fights 2016-06-16 13:00:48 +02:00
ansuz
1746a4e732 use crypto from bower 2016-06-06 12:35:06 +02:00
ansuz
2a3ff256b9 remove libraries which are now in bower 2016-06-06 12:29:45 +02:00
ansuz
f72cb24fc5 rm LORIA 2016-06-06 12:27:42 +02:00
ansuz
2c3de49922 remove realtime-input, since it's in bower now 2016-06-06 12:15:00 +02:00
ansuz
2798d1b1f9 all of the list/map api's dependencies are now on bower 2016-06-06 11:54:37 +02:00
ansuz
58c968b319 minor cleanup in realtime-input 2016-06-03 18:55:32 +02:00
ansuz
288b4d5b66 depend on main passing in the crypto module for now 2016-06-03 18:52:35 +02:00
ansuz
85dbd5cb6e pass in websocketURL from main 2016-06-03 17:27:01 +02:00
ansuz
d9a4f2f22c missed one 2016-06-03 16:44:15 +02:00
ansuz
ff0f7d15dc use json-ot from bower 2016-06-03 16:23:25 +02:00
ansuz
58633af943 listmap can be reused. put it in common/ 2016-06-03 15:47:34 +02:00
ansuz
dbf1e2b870 support reusing the netflux network 
export more internals from realtime input
 2016-06-03 15:30:51 +02:00
ansuz
83696495a8 use chainpad from bower, not local 2016-06-02 16:54:47 +02:00
ansuz
954ee26f4d fix undefined disconnect reason 2016-06-01 12:19:54 +02:00
ansuz
9336c4de5c import latest chainpad 2016-05-31 12:35:01 +02:00
ansuz
058548b95a revert my reversion 
Revert "Revert "Added checkpoints with the new code from ChainPad""

This reverts commit 6e2e8bf21f.
 2016-05-30 14:58:20 +02:00
ansuz
6e2e8bf21f Revert "Added checkpoints with the new code from ChainPad" 
This reverts commit da2bfe2de9.
 2016-05-30 10:20:08 +02:00
ansuz
ce99bd9ba3 Merge branch 'two' of github.com:xwiki-labs/cryptpad into two 2016-05-28 13:15:33 +02:00
ansuz
a0c73c95d8 do away with a bit of boilerplate 2016-05-28 13:13:54 +02:00
Caleb James DeLisle
da2bfe2de9 Added checkpoints with the new code from ChainPad 2016-05-26 17:09:02 +02:00
ansuz
cf85de6113 remove old bencoding code 2016-05-25 11:54:36 +02:00
ansuz
d99bb8ff84 WIP : fallback to old parsing doesn't work 2016-05-20 17:46:48 +02:00
ansuz
f04be53d11 fall back to old parsing if the message is bencoded? 2016-05-20 16:45:25 +02:00
ansuz
976a08cc7a move to chainpad version 2 2016-05-20 16:34:55 +02:00
ansuz
cae750cd75 update padrtc for to use bower libraries 2016-05-13 17:35:17 +02:00
ansuz
7faf57602b implement log level settings from application layer 2016-05-10 09:39:20 +02:00
ansuz
523aff3067 use upstream chainpad.js 2016-05-09 15:50:19 +02:00
ansuz
c752e4a6e5 remove sharejs 2016-05-09 14:20:11 +02:00
ansuz
6b2e986789 remove deprecated textsocket library 2016-05-09 11:57:40 +02:00
ansuz
150ebaba7b add ability to force text diffing 2016-04-27 17:58:55 +02:00
ansuz
ba17b78f7a restyle name change button 2016-04-27 15:32:58 +02:00
Yann Flory
492054a938 Fix the cursor position when a remote patch is applied 2016-04-27 12:17:06 +02:00
Yann Flory
5bb2e12db2 Merge branch 'beta' into migrate 2016-04-27 10:51:51 +02:00
Yann Flory
cc51e6d6ed Update CodeMirror pad to work with Netflux 2016-04-27 10:44:04 +02:00
Caleb James DeLisle
3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 2016-04-26 14:31:57 +02:00
Yann Flory
85d5f5c47f Convert netflux to es5 2016-04-25 15:29:39 +02:00
Caleb James DeLisle
5f16ad4a58 Update to most recent chainpad 2016-04-22 18:17:00 +02:00
ansuz
aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence 2016-04-22 17:35:07 +02:00
Yann Flory
d3203d1c2a Remove Crypto from the modules loaded with RequireJS in realtime-input 
It now has to be passed in the config in the main JS file
 2016-04-22 14:26:37 +02:00
Yann Flory
8ac69ca262 Add a missing "time" property in the netflux client causing incorrect 
timeout errors
 2016-04-22 11:46:27 +02:00
ansuz
b140b6429d remove a little bit of dead code 2016-04-22 09:46:06 +02:00
ansuz
bbdc9da853 delete duplicated file 2016-04-22 08:19:28 +02:00
ansuz
5f4825f3a0 don't change the hash from realtime input 
let applications handle that logic
 2016-04-21 19:03:50 +02:00
ansuz
4f426651ad remove TextPatcher from RealtimeTextSocket 2016-04-21 17:41:50 +02:00
ansuz
02ff1a63a4 Merge branch 'netflux' into beta 
Conflicts:
	www/assert/main.js
 2016-04-21 15:47:07 +02:00
ansuz
a18c793f98 use latest hyperjson 2016-04-21 14:53:53 +02:00
ansuz
9efcc443cd add 'format' to TextPatcher's API 2016-04-21 12:16:11 +02:00
ansuz
0769e50414 move TextPatcher to highest application layer 2016-04-20 18:56:18 +02:00
ansuz
1d70335228 provide all callbacks before starting 2016-04-20 18:27:20 +02:00
ansuz
a3787ee4dc Merge branch 'netflux' into beta 2016-04-20 15:25:00 +02:00
ansuz
010566d3c3 pushDelta was mistakenly deprecated. restored. 2016-04-20 14:20:34 +02:00
ansuz
3598c93098 move new hyperjson into common 2016-04-20 14:14:06 +02:00
ansuz
103bb69daa move custom hyperscript into common 2016-04-20 14:13:08 +02:00
ansuz
b83fb7b823 improve brFix logic 
stop exporting functions which we wish to deprecate
 2016-04-20 12:29:16 +02:00
ansuz
cb979844f6 implement text patching at application layer 2016-04-17 14:06:30 +02:00
ansuz
4a41575e6d accept onLocal in config 2016-04-17 14:05:33 +02:00
ansuz
d3c2c901b6 implement cursor transformation in a common library 2016-04-17 14:02:45 +02:00
ansuz
92d89f6cac start to factor sharejs into two modules 2016-04-15 18:17:45 +02:00
ansuz
13dc77b7f6 remove commented line 2016-04-15 18:16:54 +02:00
ansuz
41e635b2e5 realtime-input.js : turn on logging 2016-04-14 16:27:34 +02:00
Yann Flory
69e8e18283 Remove the pipe character in the hash 2016-04-14 16:10:08 +02:00
ansuz
d62e9fc1c9 add a missing semicolon 2016-04-14 15:41:02 +02:00
Yann Flory
c32045d7d0 Fix an issue with missing characters when several users were typing at the same time 2016-04-14 15:30:42 +02:00
Yann Flory
be09a1808d Remove old code from realtime-input 2016-04-14 14:46:42 +02:00
Yann Flory
6884b0890a Fix the typong tests not working properly 2016-04-14 12:24:17 +02:00
Yann Flory
e207d8b579 Merge branch 'diffdom' into netflux 2016-04-13 16:19:56 +02:00
ansuz
f4c5b2a996 Add sane defaults to TextPatcher diffs 2016-04-13 14:51:15 +02:00
ansuz
259772dd62 Turn on TextPatcher logging for _socket 2016-04-13 13:54:25 +02:00
ansuz
0537c28919 Add switchable logging to TextPatcher.js 2016-04-13 13:53:20 +02:00
Caleb James DeLisle
8a36963582 Enable ChainPad PARANOIA mode but remove the part which causes most slowness 2016-04-13 13:51:01 +02:00
ansuz
19cd991dba trim dead code, comment, very minor optimizations 2016-04-12 17:29:20 +02:00
ansuz
9f45ccb2d9 use console.error for stack traces 2016-04-12 16:47:30 +02:00
ansuz
368d72b337 add missing semicolons to TextPatcher.js 2016-04-12 15:39:53 +02:00
ansuz
851ccfbdb6 detect falsey operations in OT and ignore them 2016-04-12 15:37:47 +02:00
ansuz
400f6efde1 json-ot.js : jshint compliance 2016-04-12 15:37:47 +02:00
ansuz
ca94d30386 detect falsey operations in OT and ignore them 2016-04-12 15:35:07 +02:00
ansuz
9f9cd8d8cd realtime-input.js : fixes for jshint compliance 2016-04-12 15:07:05 +02:00
ansuz
793149a608 json-ot.js : jshint compliance 2016-04-12 15:00:46 +02:00
ansuz
06a3b63923 jshint compliance for toolbar.js 2016-04-12 14:58:24 +02:00
ansuz
5cead3fad3 add missing semicolons to TextPatcher.js 2016-04-12 14:51:06 +02:00
ansuz
94e57e4a26 update location of text-patcher.js 2016-04-12 14:21:31 +02:00
ansuz
b37dab1f49 Merge branch 'diffdom' into netflux 
Simple cleanup and unit tests
 2016-04-12 14:15:04 +02:00
ansuz
6b9d982d40 stabilize _socket/realtime-input.js 
...as common/RealtimeTextSocket.js
 2016-04-12 13:10:57 +02:00
ansuz
39071021eb stabilize typingTest.js as /common/TypingTests.js 2016-04-12 12:53:23 +02:00
ansuz
9805958ad7 stabilize text-patcher.js into /common/TextPatcher.js 2016-04-12 12:46:49 +02:00
ansuz
7782069dbd Merge pull request #15 from xwiki-labs/diffdom 
merge diffdom into netflux
 2016-04-12 10:21:19 +02:00
ansuz
a1f9b10175 remove offending line from chainpad entirely 
RTCHAINPAD-3
 2016-04-12 10:02:11 +02:00
ansuz
4ba68eb2bf fix leaky variable in chainpad 
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
 2016-04-12 09:52:36 +02:00
ansuz
05108efdfa correct chainpad's transformation function 
addresses RTCHAINPAD-3

Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
 2016-04-12 09:44:08 +02:00
Yann Flory
713c90242b Hide the usernames when they have not been changed 2016-04-11 15:00:22 +02:00
Yann Flory
0b3d6e15b8 Replace the Netflux old client (netflux.js) by the Netflux2 client. 
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
 2016-04-08 16:54:03 +02:00
Yann Flory
cf9f60bd57 The server don't send back anymore messages to their sender 2016-04-07 11:27:14 +02:00
Yann Flory
eb4ea7a6b0 Remove the content from the ACK messages sent by the server 2016-04-05 15:06:38 +02:00
Yann Flory
ba4faea939 Update the pads to run with the latest improvements to the websocket server 2016-04-05 12:17:43 +02:00
Yann Flory
5ef7e29a9b Add the latest changes from _socket into the netflux pad 2016-04-01 17:58:33 +02:00
ansuz
b59a14c5ac merge hyperjson changes from realtime xwiki 
more resilient class serialization.
comments
 2016-04-01 11:20:19 +02:00
Yann Flory
b41f0e8c50 Merge branch 'cjd-fixed-it-with-hax' into netflux2 2016-04-01 10:51:27 +02:00
ansuz
c50690349b comments describing the role of each argument 2016-04-01 10:46:54 +02:00
ansuz
96e03fcfa4 Use latest chainpad without mutations 2016-03-30 15:29:28 +02:00