Commit graph

791 commits

Author SHA1 Message Date
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
ansuz
c35c7cda20 hide wizard after computing results 2016-09-13 16:02:38 +02:00
ansuz
0dae949c4f fix scrolljank bug 2016-09-13 15:34:10 +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
ansuz
68f8d0101d fix flash of unstyled content 2016-07-25 15:28:27 +02:00
ansuz
8ea6c03094 notify user on disconnect
also disable inputs
2016-07-25 11:57:06 +02:00
ansuz
efd190beca export file with correct file extension, if possible 2016-07-25 11:26:42 +02:00
ansuz
5e71a5473c add another missing script 2016-07-25 11:26:07 +02:00
ansuz
992bc4f449 add missing script 2016-07-25 11:09:25 +02:00
ansuz
2351d8a23e make tests green again 2016-07-22 16:00:33 +02:00
ansuz
068a3f5944 remove rows from the poll 2016-07-22 15:42:41 +02:00
ansuz
c6bdb7506d forget everything about a pad when you forget it 2016-07-22 15:18:09 +02:00
ansuz
b8a3a4d188 persist usernames across sessions via localStorage 2016-07-22 14:31:40 +02:00
ansuz
846d1135b9 set mode in the editor, not just the dropdown 2016-07-22 14:16:07 +02:00
ansuz
446266a79b remember the last language used on a particular pad 2016-07-22 12:25:42 +02:00
ansuz
e84fbf0bc3 more helpers in common 2016-07-22 12:24:54 +02:00
ansuz
70f8837681 maintain scroll position on remote changes 2016-07-22 11:57:04 +02:00
ansuz
c267dd6a88 ensure that 'text' is a string 2016-07-20 12:26:57 +02:00
ansuz
2f2ab4392c clear the table on user clicks 2016-07-20 12:23:41 +02:00
ansuz
64f030c344 add a clear table button 2016-07-20 12:23:08 +02:00
ansuz
d2c5cfe646 add col/row ids to arrays 2016-07-20 12:22:49 +02:00
ansuz
1a63faf188 infer names from the first comment on code pad 2016-07-20 12:21:33 +02:00
ansuz
f77e2cec34 set text values of new options 2016-07-19 17:27:40 +02:00
ansuz
52ab5147c9 add a missing semicolon so tests don't fail 2016-07-19 16:23:39 +02:00
ansuz
e3f4df7e0a push my latest changes because I'm agile 2016-07-19 16:22:44 +02:00
ansuz
cde239c97a implement row/column removal 2016-07-18 20:57:53 +02:00
ansuz
9860b7427a addition signs are slightly informative 2016-07-18 20:57:35 +02:00
ansuz
ac50bf7286 height and width of the table are unreliable because of multiple users. remove them 2016-07-18 19:49:43 +02:00
ansuz
a3254a2619 consistent ordering of columns and rows 2016-07-18 19:49:12 +02:00
ansuz
d30eddf2f2 ui hint for 'adduser' and 'addoption' 2016-07-18 19:48:24 +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
ebf5c27453 add rename and forget buttons to poll app 2016-07-16 12:37:17 +02:00
ansuz
f7a1332317 add a 'back' button 2016-07-15 19:09:35 +02:00
ansuz
7dd1624206 commit polls to localStorage 2016-07-15 18:47:07 +02:00
ansuz
0cf5f3cc87 realtime polls! 2016-07-15 16:46:50 +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
6f598682f8 templates for custom themes 2016-07-12 12:36:13 +02:00
ansuz
02cd2fbee0 style fixes for the ansuz theme 2016-07-12 12:35:17 +02:00
ansuz
c9edf69ed1 one less prototype using messages.js while we figure out internationalization 2016-07-12 12:34:38 +02:00
ansuz
3eccec7054 better effort for translation 2016-07-11 17:36:53 +02:00
ansuz
3bdfee71e1 move padrtc to .git 2016-07-08 16:53:38 +02:00
ansuz
18ce69b756 use constants from toolbar.js, address linter warnings 2016-07-08 16:52:49 +02:00
ansuz
2a7a84b774 use constants exported from toolbar for selections
make things a little less brittle
address linter warnings
2016-07-08 16:50:56 +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
750731d3db workaround for favicon magic 2016-07-07 14:03:06 +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
a2a8570453 use alertify UI in /pad/ 2016-07-07 12:47:56 +02:00
ansuz
e32c0aaac8 use alertify UI in /code/ 2016-07-07 12:47:23 +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
85702f2706 inform users of changes in /pad/ too 2016-07-06 22:19:22 +02:00
ansuz
1ae212af44 let users know when changes have occurred while tabs lack focus 2016-07-06 22:19:01 +02:00
ansuz
6075849ed7 add favicons to /pad/ and /code/ 2016-07-06 22:17:18 +02:00
ansuz
73d2b6561a add small modules for page visibility api and notification apis 2016-07-06 22:16:17 +02:00
ansuz
7e8d66a141 filter unwanted elements when receiving patches 2016-07-06 14:51:34 +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
ec0dba3f7c correct undefined reference 2016-06-30 14:47:37 +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
93fed83a08 remove annoying border around editor 2016-06-29 15:13:45 +02:00
ansuz
23788bca67 add 'ansuz' theme because I'm horribly vain 2016-06-29 15:13:24 +02:00
ansuz
22929fd3f5 add title attributes for dropdown menus 2016-06-29 12:02:39 +02:00
ansuz
8b1a2b7b8b commit theme choices to localStorage 2016-06-29 12:00:12 +02:00
ansuz
fb2ca04c34 add a theme selector 2016-06-29 11:51:53 +02:00
ansuz
dc8e36bf20 move themes directly into ./code/ 2016-06-29 11:45:57 +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
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
5b79775810 infer modes from MIME types 2016-06-23 16:37:51 +02:00
ansuz
df99395b4d fix a few more paths that I missed 2016-06-23 12:44:30 +02:00
ansuz
b3deb9531d fix paths that I broke when updating codemirror 2016-06-23 12:44:11 +02:00
ansuz
82a9b05d5f upgrade to newest codemirror 2016-06-23 12:30:40 +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
a89511985f add _really_ basic multilanguage support. I'll come back for css later 2016-06-22 22:54:42 +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
0a8137e7eb move rememberPad to cryptpad common and simplify it a bit 2016-06-21 18:46:19 +02:00
ansuz
849683d586 update to use new style crypto module 2016-06-21 15:17:09 +02:00
ansuz
f94c06abc0 drop a bunch of stuff and use diff dom and hyperjson 2016-06-20 18:39:30 +02:00
ansuz
69f3f4c9a8 drop hyperscript dependency 2016-06-20 18:39:13 +02:00
ansuz
f607fcc0ad test using newest hyperjson. forget hyperscript 2016-06-20 18:38:56 +02:00
ansuz
c3d2568d3c add file export for codepad
addresses #24
2016-06-17 10:59:45 +02:00
ansuz
920dbeabd1 add a save button 2016-06-16 16:39:38 +02:00
ansuz
4cc5388c76 trial run of canvas export via filesaver.js 2016-06-16 16:32:39 +02:00
ansuz
f818d873bb remove usernames, refactor a wee bit 2016-06-16 16:20:51 +02:00
ansuz
2b8c21d292 set styles with setAttribute. fixes style fights 2016-06-16 13:00:48 +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
48d222e565 depend on listmap api from bower 2016-06-06 12:38:31 +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
beba78d7f8 update prototype dependencies 2016-06-06 12:14:07 +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