Commit Graph

697 Commits (f5fbebfcc9b849765e90207aa2ba56b71cc568d6)

Author SHA1 Message Date
yflory dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
yflory 99004428d5 Enable the read-only mode in Cryptpoll 2016-09-22 16:09:20 +02:00
yflory 47e8be1681 Remove the IMPORT button and editor toolbars in read-only mode 2016-09-21 15:03:36 +02:00
ansuz f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
ansuz a9e2ca8d72 make tests green again 2016-09-20 23:31:29 +02:00
yflory 83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz e6785b4dad push /pad/ state once ready to avoid OT collision 2016-09-20 16:35:55 +02:00
ansuz 723df4880e Merge branch 'slides' into merge-slides 2016-09-20 16:28:36 +02:00
ansuz b96f050555 Merge branch 'board' into merge-boards 2016-09-20 16:26:31 +02:00
ansuz fa8199bc75 don't try to use experimental user code 2016-09-20 16:22:00 +02:00
ansuz 2d42cadb23 push /code/ state once ready to avoid OT collision 2016-09-20 15:14:53 +02:00
ansuz bf5dac58dd Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc 2016-09-20 14:13:35 +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 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
Yann Flory 6363d3fb90 Pad titles are now shared with the userdoc 2016-09-16 12:49:47 +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
ansuz cc4bca8004 execute callbacks on presentation events 2016-09-14 16:03:52 +02:00
ansuz 8bf79ef915 serialize slide pads as a sorted object 2016-09-14 16:02:57 +02:00
ansuz 997b46a3f7 limit the size of rendered images 2016-09-14 16:02:20 +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 122a9fe068 realtime kanban board 2016-09-01 16:23:40 +02:00
ansuz 4561ddcdf3 add missing semicolon 2016-09-01 16:13:25 +02:00
ansuz 8031770f90 rename "module" to "APP" in /slide/ for jshint 2016-09-01 16:12:22 +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 2f2aeef0e5 add missing semicolon 2016-09-01 12:06:21 +02:00
ansuz 8a659cf887 maintain aspect ratio for slides
display index and slide count in title
2016-09-01 12:03:09 +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 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
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 e386749e89 unlock the editor after your name has been set (or not) 2016-08-25 11:36:20 +02:00
ansuz aa91ebd24e don't initialize until the store is ready 2016-08-25 11:23:51 +02:00
ansuz 93f5a3d3e9 use more bits from the users' seed and parse into various subkeys 2016-08-25 11:23:11 +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 dcebb9597f prototype of password based key derivation 2016-08-22 11:43:41 +02:00
ansuz 848f16e8f5 unused function which computes values for the table 2016-08-22 11:41:23 +02:00
ansuz 18ea61dc9a use diffdom for sanitation and better redraws 2016-08-19 15:43:14 +02:00
ansuz c62d064ee9 add a 'share' button which copies the url to the clipboard 2016-08-19 13:33:14 +02:00
ansuz b229a18ccf notify users of changes if the visibility api is supported 2016-08-19 12:14:59 +02:00
ansuz d64e06c12e don't make empty options 2016-08-19 12:14:20 +02:00
ansuz a3f6fe8843 lock options by default
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
2016-08-19 11:26:48 +02:00
ansuz 8c914dfe1f better filenames 2016-08-19 10:47:07 +02:00
ansuz f1619f4a0f get /slide/ up to par with other prototypes
* use messages.js for some translatable elements
* style alerts
* infer document name from content
* present, forget, rename, import, and export buttons
2016-08-19 10:44:49 +02:00
ansuz 269eba3c47 remove commit button if a user is removed 2016-08-18 18:31:01 +02:00
ansuz f8f66800d1 display a 'commit' button which locks your column 2016-08-18 17:54:17 +02:00
ansuz 85540bad12 leave all columns locked unless you've visited before 2016-08-18 16:13:03 +02:00
ansuz d679cac666 fewer log statements for the console 2016-08-18 15:27:55 +02:00
ansuz 55b1a17b0d off by one error 2016-08-18 15:26:00 +02:00
ansuz 235c0482f9 increase clickable area around editable columns' checkboxes 2016-08-18 13:25:21 +02:00
ansuz c76aaac542 don't make columns with empty names 2016-08-18 12:41:49 +02:00
ansuz d85684ef74 usability improvements
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
2016-08-18 12:06:13 +02:00
ansuz 76bfb6ab35 detect whether you are new to a page
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
2016-08-17 18:38:27 +02:00
ansuz e2b162bf6d snapshot some dead code 2016-08-17 15:29:04 +02:00
ansuz 55666e9f70 remember presentations, and label them correctly on the home page 2016-08-17 15:03:57 +02:00
ansuz 5a3da11c40 very simple presentation with markdown 2016-08-17 11:28:50 +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 da6e5d73d0 fix undefined reference 2016-08-05 15:55:00 +02:00
ansuz 043041523f on import, fall back to setting language from file extension 2016-08-05 15:48:30 +02:00
ansuz deb63d2447 share syntax highlighting selection with peers 2016-08-05 15:03:42 +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 975bff5794 show a spinner until the document has loaded 2016-08-04 12:43:06 +02:00
ansuz a58f58535b better regex for pulling titles out of c-like comments 2016-08-03 17:11:41 +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 01d9923e15 export Cryptpad at window level 2016-08-02 18:55:45 +02:00
ansuz fa654a7646 slightly better regex 2016-08-02 17:08:46 +02:00
ansuz 254d800a3b add a /p/ route so that we don't break old urls 2016-08-02 15:26:13 +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 9b16d529ca add one more missing script that caused handlebar highlighting to break 2016-07-29 16:21:27 +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 93142b364f tests for pretty printed html 2016-07-28 09:54:52 +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 c09166efe2 scroll down when adding a new option to the table 2016-07-25 15:42:46 +02:00
ansuz 42eafe9e29 don't create duplicate stylesheets in the document head 2016-07-25 15:39:54 +02:00
ansuz fe3f02f5e0 enable text foreground and background colors 2016-07-25 15:38:59 +02:00