Commit Graph

587 Commits (3cf87fa940429a46adfea576789d400bfa8cf35e)

Author SHA1 Message Date
ansuz e6785b4dad push /pad/ state once ready to avoid OT collision 2016-09-20 16:35:55 +02:00
Yann Flory bf8c9a2c4b Add a button to get the read only URL 2016-09-20 11:35:57 +02:00
Yann Flory 99b50465c7 Add the read-only mode for /pad and /code 2016-09-19 17:52:37 +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
Yann Flory 6363d3fb90 Pad titles are now shared with the userdoc 2016-09-16 12:49:47 +02:00
yflory 25c8d16bf5 Use a new version-prefixed hash parser 2016-09-13 17:43:56 +02:00
ansuz 7c5ee53e81 resolve conflict and merge 2016-08-25 18:01:03 +02:00
ansuz f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad 2016-08-25 17:59:37 +02:00
yflory c168ce2d1c Ability to reconnect after a connection failure 2016-08-25 17:56:17 +02:00
ansuz e386749e89 unlock the editor after your name has been set (or not) 2016-08-25 11:36:20 +02:00
ansuz 2d5caf38d9 show a spinner until the document has loaded 2016-08-04 17:00:30 +02:00
ansuz fd0a7337a3 wait a full minute until requirejs times out 2016-08-04 12:44:27 +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 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 4833cf0d7b add a fontpicker 2016-07-28 09:24:14 +02:00
ansuz 6cb2f72aa6 pretty print html during export if possible 2016-07-27 11:38:25 +02:00
ansuz fe3f02f5e0 enable text foreground and background colors 2016-07-25 15:38:59 +02:00
ansuz 992bc4f449 add missing script 2016-07-25 11:09:25 +02:00
ansuz a995f2306d fix undefined variable reference 2016-07-16 12:42:23 +02:00
ansuz 44fe95c76b add titles to buttons on pad and code 2016-07-16 12:38:21 +02:00
ansuz d39ab5c250 point to the actual translation file 2016-07-12 15:52:36 +02:00
ansuz 3eccec7054 better effort for translation 2016-07-11 17:36:53 +02:00
ansuz 18ce69b756 use constants from toolbar.js, address linter warnings 2016-07-08 16:52:49 +02:00
ansuz 750731d3db workaround for favicon magic 2016-07-07 14:03:06 +02:00
ansuz fd3cd73d0b try to fix favicon bug 2016-07-07 13:40:03 +02:00
ansuz a2a8570453 use alertify UI in /pad/ 2016-07-07 12:47:56 +02:00
ansuz 85702f2706 inform users of changes in /pad/ too 2016-07-06 22:19:22 +02:00
ansuz 6075849ed7 add favicons to /pad/ and /code/ 2016-07-06 22:17:18 +02:00
ansuz 7e8d66a141 filter unwanted elements when receiving patches 2016-07-06 14:51:34 +02:00
ansuz d844551fba add a forget button. clean up toolbar a bit 2016-06-30 17:24:25 +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 908e79c0b9 add autolink plugin 2016-06-28 12:09:43 +02:00
ansuz d025d13295 address some jshint complaints 2016-06-23 16:44:20 +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 1526c26f8e remember code and wysiwyg pads 2016-06-21 18:49:37 +02:00
ansuz 849683d586 update to use new style crypto module 2016-06-21 15:17:09 +02:00
ansuz 69f3f4c9a8 drop hyperscript dependency 2016-06-20 18:39:13 +02:00
ansuz f818d873bb remove usernames, refactor a wee bit 2016-06-16 16:20:51 +02:00
ansuz 36baf498ce fix magicline filter and strange interaction with cursor 2016-06-16 12:59:40 +02:00
ansuz 303e8d6c3e remove debugging line 2016-06-10 17:03:54 +02:00
ansuz 8af49698da add a class to the magicline markup so it's easier to remove 2016-06-10 09:56:40 +02:00
ansuz beba78d7f8 update prototype dependencies 2016-06-06 12:14:07 +02:00
ansuz ff0f7d15dc use json-ot from bower 2016-06-03 16:23:25 +02:00
ansuz 68cec2348a don't prompt the user with a crypto hash for their name 2016-06-02 16:56:01 +02:00
ansuz a0ec5eada8 better fix for magicline filter 2016-05-31 12:51:04 +02:00
ansuz e3b8a10959 fix magicline filter 2016-05-30 17:33:24 +02:00
ansuz 297d8c2d44 reformat code for jshint compliance 2016-05-20 13:39:40 +02:00
ansuz 0c89443c1b fix typo 2016-05-17 17:22:18 +02:00
ansuz 39fcd7dc4c more specific filtering for magicline plugin
to avoid false positives for other things which are non-contenteditable spans
2016-05-17 16:57:50 +02:00
ansuz ad3c53c344 use textpatcher from bower for all pads 2016-05-13 17:32:56 +02:00
ansuz d2c8fbf1f8 use hyperjson.amd.js, not hyperjson.js 2016-05-12 18:21:01 +02:00
ansuz 1769ca16dc add example for configuring the logLevel in /pad/ 2016-05-10 10:23:22 +02:00
ansuz d2fa5e8f70 start using hyperjson from bower.io 2016-05-09 11:41:02 +02:00
ansuz 506a703b7d turn off TextPatcher logging on /pad/ 2016-04-27 15:42:27 +02:00
ansuz 32d1807350 import unused functions from /p/, to be integrated later 2016-04-27 12:25:19 +02:00
ansuz 626ecaffcd log browser fights in /pad/ 2016-04-27 11:10:31 +02:00
Yann Flory 53b2644b64 Fix a issue with fights over usernames 2016-04-26 17:16:58 +02:00
Yann Flory c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc 2016-04-25 15:29:09 +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
ansuz 4c95602347 remove a little bit more dead code 2016-04-22 09:46:41 +02:00
ansuz cce50390a0 don't depend on library to set hash 2016-04-21 19:04:15 +02:00
ansuz 0769e50414 move TextPatcher to highest application layer 2016-04-20 18:56:18 +02:00
Yann Flory 69e8e18283 Remove the pipe character in the hash 2016-04-14 16:10:08 +02:00
Yann Flory 6884b0890a Fix the typong tests not working properly 2016-04-14 12:24:17 +02:00
Yann Flory ecc41d14af Use canonical serializer for json serialization 2016-04-13 17:46:41 +02:00
Yann Flory 9683fd9aec Always serialize the DOM in one way. 2016-04-13 16:46:31 +02:00
ansuz f75c246029 remove dead code from pad/main.js 2016-04-12 17:17:14 +02:00
ansuz a0999d1d2b add a comment about why hashes are being stubbed 2016-04-12 15:36:03 +02:00
ansuz 3b8238ef3b add missing semicolons to pad/main.js
jshint compliance
2016-04-12 14:51:32 +02:00
ansuz e6ab03164c import TypingTests.js and expose at the console
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
2016-04-12 14:34:47 +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 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
Yann Flory de6db0285c Limit the size of the usernames to 32 chars 2016-03-16 17:48:27 +01:00
Yann Flory 7237c751d5 Move 'vdom' to the main 'pad'.
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
2016-03-16 17:09:08 +01:00
ansuz 3cb94b8d80 jshint compliance 2016-02-15 16:07:46 +01:00
ansuz f1915d3b7c fix jshint complaints in pad directory 2016-02-12 16:21:17 +01:00
ansuz 967d636df9 address more jshint complaints 2016-02-12 11:39:37 +01:00
ansuz c71b060dc2 main.js : wait until your editor is defined before trying to reference it. addresses a race condition that caused ckeditor to fail half the time. 2016-01-14 05:14:45 -05:00
Caleb James DeLisle 51544db9a2 Completed adding of customization system and bottom infobar 2015-02-02 16:01:33 +01:00
Caleb James DeLisle 0e44b10aeb Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet 2015-01-30 16:52:23 +01:00
Caleb James DeLisle c13bfe978a Switched cryptpad to use common/toolbar.js which is shared with cryptsheet 2015-01-30 11:10:51 +01:00
Caleb James DeLisle 50c10f818e Added cryptsheet to cryptpad suite! 2015-01-29 17:55:18 +01:00