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
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
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