ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
2017-04-14 15:34:05 +02:00 |
|
ansuz
|
fbebbf0dca
|
minor clean up
|
2017-04-14 15:32:12 +02:00 |
|
ansuz
|
525d35c9ec
|
redefine alert
|
2017-04-14 14:54:43 +02:00 |
|
Pierre Bondoerffer
|
20c252e5c6
|
fix placeholder styling in safari
|
2017-04-14 12:45:45 +02:00 |
|
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
2017-04-14 12:25:32 +02:00 |
|
ansuz
|
a4157b9908
|
remove more unused functions
|
2017-04-14 12:14:10 +02:00 |
|
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
2017-04-14 12:09:00 +02:00 |
|
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
2017-04-14 11:41:51 +02:00 |
|
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
2017-04-14 11:41:18 +02:00 |
|
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
2017-04-14 11:40:28 +02:00 |
|
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 19:47:04 +02:00 |
|
ansuz
|
520ae822fc
|
correct undefined reference
|
2017-04-13 19:46:52 +02:00 |
|
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
2017-04-13 19:46:38 +02:00 |
|
ansuz
|
bf047fcf65
|
Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
|
2017-04-13 19:43:30 +02:00 |
|
Pierre Bondoerffer
|
96ff487271
|
fix flash of content
|
2017-04-13 19:36:04 +02:00 |
|
ansuz
|
5a7eea08c8
|
Merge pull request #108 from pbondoer/newpoll
Poll fixes
|
2017-04-13 18:04:13 +02:00 |
|
Pierre Bondoerffer
|
248f88034b
|
important fixes
|
2017-04-13 17:56:28 +02:00 |
|
yflory
|
633d60ccd0
|
Remove a TODO
|
2017-04-13 17:19:32 +02:00 |
|
Pierre Bondoerffer
|
6b57bb2bbb
|
poll: press enter to validate input
|
2017-04-13 17:09:31 +02:00 |
|
Pierre Bondoerffer
|
d483e10e77
|
poll fixes
|
2017-04-13 17:07:09 +02:00 |
|
yflory
|
81d83897ec
|
Rename hash.js
|
2017-04-13 17:04:15 +02:00 |
|
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
2017-04-13 16:43:07 +02:00 |
|
Pierre Bondoerffer
|
ea5301be13
|
poll improved(tm)
|
2017-04-13 16:31:57 +02:00 |
|
Pierre Bondoerffer
|
7434dbcb0f
|
what i have
|
2017-04-13 15:27:37 +02:00 |
|
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 15:04:23 +02:00 |
|
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
2017-04-13 15:04:17 +02:00 |
|
ansuz
|
607d9652f5
|
jshint compliance
|
2017-04-13 14:48:15 +02:00 |
|
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
2017-04-13 14:44:55 +02:00 |
|
Pierre Bondoerffer
|
f11cf8e6ac
|
move poll styles to separate file
|
2017-04-13 14:14:12 +02:00 |
|
yflory
|
daabb0b3ad
|
Integrate and fix the new fileObject (userObject)
|
2017-04-13 14:06:40 +02:00 |
|
ansuz
|
df4a250359
|
use feedback api instead of app=
|
2017-04-13 12:18:08 +02:00 |
|
ansuz
|
86c37bfa37
|
fix find+replace error
|
2017-04-13 11:11:45 +02:00 |
|
ansuz
|
e618483395
|
extract all code for encoding and decoding hashes
|
2017-04-13 11:05:28 +02:00 |
|
ansuz
|
fdd2716ad5
|
move constants to the top of cryptpad-common.js
|
2017-04-13 10:31:08 +02:00 |
|
yflory
|
c1e0316d43
|
Refactor fileObject
|
2017-04-12 18:54:22 +02:00 |
|
ansuz
|
5212539a16
|
move standalone functions from common into their own file
|
2017-04-12 17:54:44 +02:00 |
|
ansuz
|
7437d6b902
|
remove unused function
|
2017-04-12 17:09:42 +02:00 |
|
ansuz
|
4e590a9dd1
|
remove even more dead code
|
2017-04-12 16:16:58 +02:00 |
|
ansuz
|
85fcaa9bbc
|
remove more dead code
|
2017-04-12 16:13:25 +02:00 |
|
ansuz
|
401936a91e
|
move singly-used css file out of /common/
|
2017-04-12 16:09:05 +02:00 |
|
ansuz
|
9a46b58c85
|
deprecate this 90 days after f-release
|
2017-04-12 16:03:41 +02:00 |
|
ansuz
|
7a59183bb1
|
pinpad.create should always be async
|
2017-04-12 16:02:42 +02:00 |
|
ansuz
|
8de3610532
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-12 16:02:09 +02:00 |
|
ansuz
|
9aa0548b1f
|
remove dead cursor code
|
2017-04-12 15:59:30 +02:00 |
|
yflory
|
4e61b79f9a
|
Clean fileObject
|
2017-04-11 15:11:33 +02:00 |
|
yflory
|
cde724399c
|
Pin the pads
|
2017-04-11 14:53:44 +02:00 |
|
yflory
|
74ea2fce5a
|
Fix lint error...
|
2017-04-10 19:18:46 +02:00 |
|
yflory
|
aa49c97d6e
|
Fix lint error
|
2017-04-10 19:13:36 +02:00 |
|
ansuz
|
2c8d1b8183
|
jshint compliance
|
2017-04-10 19:12:22 +02:00 |
|
yflory
|
f0836f745e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 18:25:17 +02:00 |
|
yflory
|
528deb11da
|
Add missing file for whiteboard
|
2017-04-10 18:25:02 +02:00 |
|
ansuz
|
cde9ea9887
|
update footer version
|
2017-04-10 18:09:22 +02:00 |
|
ansuz
|
05a50b1f4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 17:42:43 +02:00 |
|
ansuz
|
a14bb1480a
|
progress for implicit pinning
|
2017-04-10 17:42:35 +02:00 |
|
ansuz
|
f82278a25c
|
handle return of undefined hash
|
2017-04-10 17:38:25 +02:00 |
|
yflory
|
d5e69653c0
|
Select opacity in draw mode in the canvas app
|
2017-04-10 17:03:50 +02:00 |
|
ansuz
|
1d933be5a6
|
make reset return the hash, not an array with containing it
|
2017-04-10 15:57:38 +02:00 |
|
yflory
|
f34492be94
|
Remove duplicates uid in the user list
|
2017-04-10 15:27:01 +02:00 |
|
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
2017-04-10 14:19:48 +02:00 |
|
yflory
|
bd16e0f0e7
|
Templates in polls and canvas, and ability to disable templates
|
2017-04-10 14:19:15 +02:00 |
|
yflory
|
63a130c678
|
Add a button to delete the selection in canvas
|
2017-04-10 11:55:39 +02:00 |
|
yflory
|
33e19d5918
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 11:44:17 +02:00 |
|
yflory
|
126498585e
|
Add a context menu on the ROOT folder in the drive
|
2017-04-10 11:44:11 +02:00 |
|
yflory
|
be1db2a1ec
|
Ability to remove an object when draw mode is off
|
2017-04-10 11:28:41 +02:00 |
|
ansuz
|
108ab7e9de
|
comment out a style assignment that doesn't seem necessary
|
2017-04-09 11:55:27 +02:00 |
|
ansuz
|
8c629185e1
|
cleaner less file
|
2017-04-09 11:49:14 +02:00 |
|
ansuz
|
0db141e48d
|
rename style files 'whiteboard' instead of main
|
2017-04-09 11:48:01 +02:00 |
|
ansuz
|
395d8625a8
|
draw the palette on pad creation
|
2017-04-08 10:44:12 +02:00 |
|
ansuz
|
3b99c42e22
|
no more inline styles
|
2017-04-07 22:05:31 +02:00 |
|
ansuz
|
ef821c3e7e
|
integrate @lukevers improvements and clean up js a bit
|
2017-04-07 19:39:08 +02:00 |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
2017-04-07 18:20:03 +02:00 |
|
ansuz
|
bd2034c47b
|
prepare rpc before 'ready' if pinning is enabled
|
2017-04-07 17:24:25 +02:00 |
|
ansuz
|
a70388284d
|
disable unnecessary messages
|
2017-04-07 17:21:04 +02:00 |
|
ansuz
|
abd87e1322
|
jshint compliance
|
2017-04-07 16:33:14 +02:00 |
|
ansuz
|
e4b15bc616
|
implement 'getCanonicalChannelList'
|
2017-04-07 15:52:34 +02:00 |
|
ansuz
|
09f8e139fe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-07 15:20:39 +02:00 |
|
ansuz
|
a2f692b9a3
|
clean up serverside and clientside pinning logic
|
2017-04-07 15:20:30 +02:00 |
|
yflory
|
a13261abaa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-07 14:54:13 +02:00 |
|
yflory
|
dedf2b3c69
|
Display selected color and button to turn off draw mode in canvas
|
2017-04-07 14:54:02 +02:00 |
|
ansuz
|
fdede0d1fd
|
remove some dead code
|
2017-04-07 12:18:03 +02:00 |
|
ansuz
|
e87992c7ec
|
implement atomic pin reset rpc
|
2017-04-07 11:37:19 +02:00 |
|
ansuz
|
166e70f628
|
test new rpc apis
|
2017-04-07 10:32:26 +02:00 |
|
ansuz
|
2a566671f2
|
remove outdated rpc example
|
2017-04-07 10:31:38 +02:00 |
|
ansuz
|
3380cf0348
|
implement getTotalSize rpc
|
2017-04-07 10:09:59 +02:00 |
|
ansuz
|
6e1ffcc18d
|
define better color palette
|
2017-04-06 18:45:40 +02:00 |
|
yflory
|
84029ac2d7
|
Fix the color picker in Chromium 53 and improve the cursor
|
2017-04-06 12:38:11 +02:00 |
|
ansuz
|
5c292fb1fa
|
jshint compliance
|
2017-04-06 08:32:31 +02:00 |
|
yflory
|
b14d89360d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 19:00:13 +02:00 |
|
yflory
|
8e29e30a35
|
Realtime palette + cursor corresponding to the brush
|
2017-04-05 18:59:58 +02:00 |
|
ansuz
|
8bbbf8e252
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 17:28:11 +02:00 |
|
ansuz
|
64089c5f6b
|
implement pad pinning
|
2017-04-05 17:28:04 +02:00 |
|
yflory
|
d07acc5364
|
Don't redraw the drive if filesData changes while in unsorted
|
2017-04-05 16:08:39 +02:00 |
|
yflory
|
13514dff63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 15:00:10 +02:00 |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
2017-04-05 14:57:07 +02:00 |
|
ansuz
|
6c7cdc90a9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:24:17 +02:00 |
|
ansuz
|
212baeb3a6
|
better cookie schema. expire old sessions
|
2017-04-05 12:24:01 +02:00 |
|
yflory
|
54d271c4e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:04:18 +02:00 |
|
yflory
|
a9777ce560
|
Fix input losing focus in polls with Chrome 57
|
2017-04-05 12:04:01 +02:00 |
|
ansuz
|
3484515283
|
enable more tests
|
2017-04-05 10:44:14 +02:00 |
|
ansuz
|
3e47b8a38d
|
remove dead code
|
2017-04-05 10:42:24 +02:00 |
|
ansuz
|
31b178a306
|
use pinpad api
|
2017-04-04 12:25:34 +02:00 |
|
ansuz
|
182dbfc874
|
implement pinning logic in pinpad.js
|
2017-04-04 12:13:31 +02:00 |
|
ansuz
|
a5e5ddae08
|
rpc all the things
|
2017-04-03 19:24:57 +02:00 |
|
ansuz
|
4f7e25eeb9
|
show labels for brush width
|
2017-04-03 10:43:57 +02:00 |
|
ansuz
|
2a6de5163b
|
jshint compliance
|
2017-03-31 18:54:50 +02:00 |
|
ansuz
|
04069cc7f4
|
fix font size
|
2017-03-31 13:28:30 +02:00 |
|
ansuz
|
1e51f89096
|
wipe the userdoc when the canvas is cleared
|
2017-03-31 12:01:52 +02:00 |
|
ansuz
|
e2981c0223
|
try to make the color picker show the current color
|
2017-03-31 12:01:30 +02:00 |
|
ansuz
|
96dac80bd5
|
better color picker in whiteboard
|
2017-03-31 11:02:59 +02:00 |
|
ansuz
|
bd07b3a80f
|
less cramped styling on text inputs on /settings/
|
2017-03-31 09:36:22 +02:00 |
|
ansuz
|
6e9968f989
|
add 'lol' code theme
|
2017-03-31 09:19:45 +02:00 |
|
ansuz
|
b85324a29e
|
jshint compliance
|
2017-03-31 09:18:57 +02:00 |
|
ansuz
|
73d4fd1700
|
handle reconnection attempts
|
2017-03-30 18:52:43 +02:00 |
|
ansuz
|
b07248ad42
|
prompt with setName if name is unset
|
2017-03-30 18:52:20 +02:00 |
|
ansuz
|
9b4b642d4a
|
protect against subtly corrupted user objects
|
2017-03-30 17:19:49 +02:00 |
|
ansuz
|
18469edf18
|
extend list item rendering to support gfm task lists
|
2017-03-30 12:02:31 +02:00 |
|
ansuz
|
055bc03092
|
strip carriage return
|
2017-03-30 12:00:46 +02:00 |
|
ansuz
|
bca13ad5a5
|
add notifications to whiteboard
|
2017-03-29 18:57:46 +02:00 |
|
ansuz
|
233bb7a14f
|
reorganize some html tags for smaller diffs
|
2017-03-29 18:38:06 +02:00 |
|
ansuz
|
76471f7b90
|
add forget button to whiteboard and handle disconnection better
|
2017-03-29 18:35:52 +02:00 |
|
ansuz
|
d4ce3dc6b9
|
don't rewrite css rules. FOUC is too long
|
2017-03-29 16:02:04 +02:00 |
|
ansuz
|
3cfd0a4326
|
commit some garbage
|
2017-03-29 15:40:34 +02:00 |
|
ansuz
|
364dae2882
|
update templated html
|
2017-03-29 12:56:08 +02:00 |
|
ansuz
|
ed89a13fe6
|
progress on adding version string to some css
|
2017-03-29 12:55:36 +02:00 |
|
ansuz
|
4d5baa717d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-29 11:56:13 +02:00 |
|
ansuz
|
76990ac1b2
|
version toolbar.css for cache-busting
|
2017-03-29 11:56:03 +02:00 |
|
ansuz
|
9d3f859657
|
add a contextMenu entry for the whiteboard app
|
2017-03-29 11:55:24 +02:00 |
|
yflory
|
7ede430db3
|
Fix 'search.oldLocation is undefined' error
|
2017-03-28 14:26:41 +02:00 |
|
ansuz
|
df7363f416
|
regenerate templated files for new footer
|
2017-03-28 11:50:42 +02:00 |
|
yflory
|
72fecb9549
|
Fix lint errors
|
2017-03-28 11:05:45 +02:00 |
|
yflory
|
af68e41fb6
|
Always set the focus to the search bar in the drive
|
2017-03-28 10:57:13 +02:00 |
|
yflory
|
67f4096396
|
Fix cursor in the drive search bar
|
2017-03-28 10:48:29 +02:00 |
|
yflory
|
12cc49b575
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-27 18:31:07 +02:00 |
|
yflory
|
72c60ec676
|
Add background to the whiteboard app
|
2017-03-27 18:30:48 +02:00 |
|
yflory
|
2732b7aa82
|
Fix module.onLocal not defined
|
2017-03-27 18:21:14 +02:00 |
|
ansuz
|
a0c17d7c9b
|
latest rpc code
|
2017-03-27 18:15:15 +02:00 |
|
yflory
|
4ddf9b4e04
|
Improve whiteboard UI
|
2017-03-27 18:12:11 +02:00 |
|
yflory
|
89877baa69
|
Fix read-only mode in canvas app
|
2017-03-27 17:15:54 +02:00 |
|
yflory
|
c2cb24c072
|
Add toolbar to the whiteboard app
|
2017-03-27 17:08:44 +02:00 |
|
ansuz
|
973aeba0da
|
remove bundled fabric.js
|
2017-03-27 12:48:54 +02:00 |
|
ansuz
|
6eab52c33d
|
use secure fabric.js
|
2017-03-27 12:45:39 +02:00 |
|
ansuz
|
59a80d5fde
|
remove silly TODO
|
2017-03-27 12:08:19 +02:00 |
|
ansuz
|
ce5dbaeafd
|
use alertify instead of browser prompt
|
2017-03-27 12:00:21 +02:00 |
|
yflory
|
71c59d7ae2
|
Remove unnecessary TODOs
|
2017-03-27 11:53:13 +02:00 |
|
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
2017-03-27 11:34:54 +02:00 |
|
yflory
|
a8ffac5dcd
|
Remove old code
|
2017-03-27 11:30:09 +02:00 |
|
yflory
|
5322eff607
|
Use the current values for the checkboxes in the print options dialog
|
2017-03-27 11:23:51 +02:00 |
|
yflory
|
53c60a31f6
|
Set the properties and backup inputs to read-only in the drive
|
2017-03-27 11:14:37 +02:00 |
|
yflory
|
0c5a930cb9
|
Fix an issue with the 'Properties' entry not always displayed in context menu
|
2017-03-27 10:58:23 +02:00 |
|
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
2017-03-24 14:26:36 +01:00 |
|
ansuz
|
912215185f
|
add uid to userdata for better notifications
|
2017-03-24 13:32:42 +01:00 |
|
ansuz
|
fa9249ef29
|
don't notify for userlist changes if a user joins twice
|
2017-03-24 13:17:51 +01:00 |
|
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
2017-03-24 12:17:49 +01:00 |
|
ansuz
|
e2ee80d4e7
|
set icon for whiteboard app
|
2017-03-23 16:16:24 +01:00 |
|
ansuz
|
dbca94437e
|
rename canvas app to 'whiteboard'
|
2017-03-23 16:16:00 +01:00 |
|
yflory
|
994d640f8b
|
Fix an issue causing the lag icon to lose its color
|
2017-03-21 14:52:49 +01:00 |
|
yflory
|
819c7e3bae
|
Fix style issue with drag&drop in the active folder
|
2017-03-21 14:49:02 +01:00 |
|
yflory
|
6fbd1f0028
|
Store the dates as number and not strings to avoid ot issues
|
2017-03-21 14:46:40 +01:00 |
|
yflory
|
8556ce9d17
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-21 12:45:53 +01:00 |
|
yflory
|
8ce8401107
|
Fix issues with middle click in context menus
|
2017-03-21 12:45:39 +01:00 |
|
yflory
|
5f4990cc80
|
Display or hide the context menu in a more intuitive way with multiselect
|
2017-03-21 12:37:45 +01:00 |
|
yflory
|
51033ab70a
|
Remove useless links in the context menu and properties for readonly pads in the drive
|
2017-03-21 12:09:07 +01:00 |
|
ansuz
|
2b2e581779
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-21 11:47:27 +01:00 |
|
ansuz
|
2e8484ad4c
|
notes about what to improve. transform json on OT instead of just validating
|
2017-03-21 11:47:11 +01:00 |
|
yflory
|
7afde2309d
|
Add properties to the files not in the trash
|
2017-03-21 11:34:18 +01:00 |
|
yflory
|
61d33f2dd6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop
|
2017-03-21 10:44:10 +01:00 |
|
yflory
|
66a80ea50c
|
Add properties for pads in the drive
|
2017-03-20 18:59:27 +01:00 |
|
ansuz
|
b542245086
|
fix lint error
|
2017-03-20 18:11:26 +01:00 |
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-20 18:05:39 +01:00 |
|
ansuz
|
98027dad27
|
jshint compliance
|
2017-03-20 18:02:11 +01:00 |
|
ansuz
|
eeecb1baab
|
Make Canvas Work Again
|
2017-03-20 18:01:13 +01:00 |
|
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
2017-03-20 17:51:56 +01:00 |
|
yflory
|
29174b2922
|
Update the lag icon
|
2017-03-20 16:39:33 +01:00 |
|
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
2017-03-20 15:20:42 +01:00 |
|
yflory
|
85105a1382
|
Active folder in drive is not underlined anymore
|
2017-03-20 14:16:44 +01:00 |
|
yflory
|
cd77f50717
|
Fix transitions in slides, add swipe event handlers, and fix print in firefox
|
2017-03-20 12:50:46 +01:00 |
|
yflory
|
e139295d7e
|
Add transitions in present mode
|
2017-03-17 18:39:39 +01:00 |
|
yflory
|
45ac3e40a2
|
Copy print options to present mode
|
2017-03-17 18:03:00 +01:00 |
|
yflory
|
a5f11d0d0d
|
Uniform the slides rendering in present and print mode
|
2017-03-17 15:30:27 +01:00 |
|
ansuz
|
d422c7e165
|
support old hashes in getUserChannelList
|
2017-03-16 17:14:54 +01:00 |
|
ansuz
|
7d5ff27900
|
better rpc tests, sum up your channel usage
|
2017-03-16 17:03:45 +01:00 |
|
ansuz
|
5ed6223313
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-16 14:47:03 +01:00 |
|
ansuz
|
7f2f1f7191
|
correctly initialize RPC object
|
2017-03-16 14:46:55 +01:00 |
|
ansuz
|
c9c9dd0999
|
use userChannelList if a list is not supplied to pinpad
|
2017-03-16 14:46:17 +01:00 |
|
ansuz
|
e8c3cf6aa5
|
implement rpc message signing
|
2017-03-16 14:45:38 +01:00 |
|
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
2017-03-16 14:43:57 +01:00 |
|
yflory
|
f98c825dc3
|
Fix keyboard shortcuts not working in CryptDrive
|
2017-03-16 14:43:00 +01:00 |
|
yflory
|
7b27f1dc2c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-16 14:16:54 +01:00 |
|
yflory
|
7761aaa89f
|
Add search UI
|
2017-03-16 14:16:42 +01:00 |
|
ansuz
|
b578803136
|
clean up registration code a little bit
|
2017-03-16 10:37:16 +01:00 |
|
ansuz
|
c3c866fa2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:53 +01:00 |
|
yflory
|
d19bbcb001
|
Add support for search in the drive
|
2017-03-15 18:59:55 +01:00 |
|
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:38 +01:00 |
|
ansuz
|
298725b3c2
|
don't show usage tips on error screens
|
2017-03-15 18:58:39 +01:00 |
|
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
2017-03-15 18:57:13 +01:00 |
|
yflory
|
9a32fb1999
|
Fix sub-folders changing position in the tree when renaming them
|
2017-03-15 17:34:06 +01:00 |
|
yflory
|
931f7619c0
|
Keep the scroll position on redraw in drive
|
2017-03-15 17:30:52 +01:00 |
|
yflory
|
0607c3bbf3
|
Add a title to the 'new' button in drive
|
2017-03-15 17:20:08 +01:00 |
|
yflory
|
b9c64a526a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 17:15:03 +01:00 |
|
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
2017-03-15 17:14:49 +01:00 |
|
ansuz
|
8129b8cdc1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 16:05:05 +01:00 |
|
ansuz
|
15a67afc75
|
jshint compliance
|
2017-03-15 16:04:52 +01:00 |
|
yflory
|
13d7b3cadc
|
Merge branch 'd' into staging
|
2017-03-15 16:01:29 +01:00 |
|
yflory
|
a286599f93
|
Fix fast reconnect, and add support for reconnecting ws in polls
|
2017-03-15 16:01:00 +01:00 |
|
ansuz
|
bd9efd7c04
|
provide examples of valid and invalid rpc calls
|
2017-03-15 15:56:32 +01:00 |
|
ansuz
|
7187d3c550
|
implement getUserChannelList
|
2017-03-15 15:55:55 +01:00 |
|
ansuz
|
306f6ce806
|
resolve merge-conflict with accounting branch
|
2017-03-14 15:52:04 +01:00 |
|
yflory
|
fe5e33a0ee
|
Fix loss of presentation position when updating slides
|
2017-03-14 15:42:42 +01:00 |
|
ansuz
|
805e26bc07
|
add a version footer to main pages
|
2017-03-14 14:34:13 +01:00 |
|
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
2017-03-14 12:49:22 +01:00 |
|
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
2017-03-14 12:39:50 +01:00 |
|
yflory
|
16e5788011
|
Call the callback if we can't parse the local Drive to import it
|
2017-03-14 12:09:52 +01:00 |
|
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
2017-03-14 12:01:42 +01:00 |
|
ansuz
|
5d88c3a436
|
newer registration code
|
2017-03-14 12:00:23 +01:00 |
|
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 19:32:15 +01:00 |
|
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
2017-03-13 19:30:56 +01:00 |
|
yflory
|
ceaf757680
|
Allow right click on the CryptPad logo/link in the top left corner
|
2017-03-13 18:49:30 +01:00 |
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
|
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:17 +01:00 |
|
yflory
|
84c16c00ad
|
Fix click events not working on inputs in the drive tree
|
2017-03-13 15:53:13 +01:00 |
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
2017-03-13 12:56:49 +01:00 |
|
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
2017-03-13 11:52:48 +01:00 |
|
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
2017-03-13 11:52:39 +01:00 |
|
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 10:59:20 +01:00 |
|
ansuz
|
d9996cc874
|
current work for pinning
|
2017-03-13 10:56:08 +01:00 |
|
ansuz
|
a7d61aa562
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 18:04:07 +01:00 |
|
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
2017-03-10 18:03:52 +01:00 |
|
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
2017-03-10 16:46:36 +01:00 |
|
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 10:49:33 +01:00 |
|
yflory
|
2392167996
|
Export slides as PDF
|
2017-03-09 19:05:44 +01:00 |
|
yflory
|
4bac8ea0c7
|
Draw all the slides at once to allow reference links (fix #77)
|
2017-03-09 12:41:23 +01:00 |
|
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
2017-03-08 18:05:15 +01:00 |
|
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
2017-03-08 16:47:38 +01:00 |
|
yflory
|
a8d200ef2e
|
Don't redirect until realtime is synced when logging in
|
2017-03-08 16:15:31 +01:00 |
|
yflory
|
0c1efd361b
|
Make sure the href is updated everywhere when importing a stronger link
|
2017-03-08 15:49:02 +01:00 |
|
yflory
|
b701e3cc85
|
Fix lint errors
|
2017-03-08 14:59:51 +01:00 |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
|
yflory
|
f62267f8a1
|
Ability to import local pads in the user object
|
2017-03-07 18:39:21 +01:00 |
|
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
2017-03-07 17:33:31 +01:00 |
|
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
2017-03-07 17:30:32 +01:00 |
|
yflory
|
ce6cd1211e
|
Fix lint errors
|
2017-03-07 15:33:08 +01:00 |
|
ansuz
|
aa762e7d63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-07 15:33:01 +01:00 |
|
ansuz
|
8a48612de2
|
add some notes for later
|
2017-03-07 14:40:06 +01:00 |
|
yflory
|
9ad33574e9
|
Fix the function returning the pads list in the drive
|
2017-03-07 14:30:07 +01:00 |
|
yflory
|
14938089ac
|
Keep the focus on the iframe window after canceling a deletion
|
2017-03-07 14:24:06 +01:00 |
|
yflory
|
3f7dea8f7e
|
Context menu support for multi-select options in drive
|
2017-03-07 12:22:02 +01:00 |
|
yflory
|
e1c02fd8a4
|
Drive rename: save pads and folders name on click, cancel with Esc.
|
2017-03-06 18:15:14 +01:00 |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
|
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
2017-03-06 14:56:41 +01:00 |
|
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
2017-03-06 12:20:23 +01:00 |
|
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 18:16:39 +01:00 |
|
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
2017-03-03 18:16:34 +01:00 |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
2017-03-03 18:14:53 +01:00 |
|
yflory
|
27241488a5
|
Merge pull request #96 from pbondoer/css
(CSS) Some improvements to drive
|
2017-03-03 16:33:20 +01:00 |
|
Pierre Bondoerffer
|
6c9da646e0
|
(CSS) Some improvements to drive
|
2017-03-03 16:26:08 +01:00 |
|
ansuz
|
08c862b271
|
add FIXME notes to poll
|
2017-03-03 16:13:32 +01:00 |
|
yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
2017-03-03 12:48:00 +01:00 |
|
yflory
|
a68acac13b
|
Only ask for a display name once in /poll
|
2017-03-03 12:07:16 +01:00 |
|
yflory
|
a978b51656
|
If display name is empty, use anonymous in the drive
|
2017-03-03 12:06:35 +01:00 |
|
yflory
|
153386a6e0
|
CSS improvements in the drive tree
|
2017-03-02 18:24:18 +01:00 |
|
yflory
|
6098f28260
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 18:16:20 +01:00 |
|
yflory
|
a852112808
|
Fix open folder from the tree context menu
|
2017-03-02 18:16:16 +01:00 |
|
ansuz
|
2c9deed381
|
Merge pull request #94 from pbondoer/staging
Some CSS fixes
|
2017-03-02 18:15:30 +01:00 |
|
ansuz
|
868161a8a8
|
fix undefined reference in code
|
2017-03-02 17:59:59 +01:00 |
|
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 17:59:35 +01:00 |
|
Pierre Bondoerffer
|
800db07077
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:44:29 +01:00 |
|
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
2017-03-02 17:40:29 +01:00 |
|
yflory
|
52793385ea
|
Fix lint errors
|
2017-03-02 17:17:55 +01:00 |
|
Pierre Bondoerffer
|
e39fe1c0b7
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:09:39 +01:00 |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
|
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
|
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
2017-03-02 17:01:27 +01:00 |
|
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
2017-03-02 16:38:22 +01:00 |
|
yflory
|
370ae81106
|
Use the display name in the backup file name if not logged in
|
2017-03-02 16:29:17 +01:00 |
|
Pierre Bondoerffer
|
e0d972674f
|
Fix context menu in drive and rename textbox styling
|
2017-03-02 16:22:32 +01:00 |
|
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
2017-03-02 16:01:34 +01:00 |
|
Pierre Bondoerffer
|
d26d8f53d9
|
(CSS) Fixed textarea being too large
|
2017-03-02 15:50:03 +01:00 |
|
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
2017-03-02 11:38:20 +01:00 |
|
yflory
|
6b8d0c8bc7
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
2017-03-02 10:53:48 +01:00 |
|
yflory
|
b32d698291
|
Fix issue with present mode in slide (readonly)
|
2017-03-02 10:53:45 +01:00 |
|
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
2017-03-02 10:15:13 +01:00 |
|
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
2017-03-01 21:06:53 +01:00 |
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
2017-03-01 17:05:57 +01:00 |
|
yflory
|
53f4f8826e
|
Merge branch 'staging' into staging
|
2017-03-01 16:32:18 +01:00 |
|
yflory
|
55210f17eb
|
Clean the code to be less dependant on 'li'
|
2017-03-01 16:15:48 +01:00 |
|
Pierre Bondoerffer
|
3e9c4d0901
|
Add hover to file manager tree
|
2017-03-01 15:57:22 +01:00 |
|
Pierre Bondoerffer
|
cbdfae09a6
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 15:53:48 +01:00 |
|
yflory
|
c6c3e1bbb5
|
Don't select subfolders in the tree when drag&drop
|
2017-03-01 15:53:31 +01:00 |
|
Pierre Bondoerffer
|
d605fc757b
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 15:46:49 +01:00 |
|
yflory
|
a26b9d3240
|
Don't select subfolders in the tree when right-click on drag&drop
|
2017-03-01 15:46:10 +01:00 |
|
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
2017-03-01 15:07:34 +01:00 |
|
Pierre Bondoerffer
|
b0323f6fd9
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 14:45:18 +01:00 |
|
yflory
|
a2b5200381
|
Add a container for the folders in the tree in the drive
|
2017-03-01 14:44:43 +01:00 |
|
yflory
|
412815b042
|
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
|
2017-03-01 13:10:55 +01:00 |
|
yflory
|
11d54256da
|
Make sure the display name is displayed in the same way everywhere
|
2017-03-01 13:10:06 +01:00 |
|
yflory
|
2c5c6da0d9
|
Fix XSS in alertify logs
|
2017-03-01 13:09:14 +01:00 |
|
yflory
|
5797aab3f2
|
Fix XSS with display names in the user list
|
2017-03-01 13:08:36 +01:00 |
|
yflory
|
26e3971482
|
Fix XSS in the user dropdown menu
|
2017-03-01 13:08:09 +01:00 |
|
ansuz
|
639376f1cb
|
don't use hyperjson.toString
|
2017-03-01 12:36:10 +01:00 |
|
Pierre Bondoerffer
|
eb9a39eb68
|
Add hover on elements in drive and make grid slightly prettier
|
2017-02-28 23:15:47 +01:00 |
|
yflory
|
f130fd0598
|
Fix horizontal scrollbar in edge
|
2017-02-28 18:02:12 +01:00 |
|
yflory
|
345d2faab2
|
Fix horizontal scrollbar in Edge #3
|
2017-02-28 17:13:51 +01:00 |
|
yflory
|
d683dc499a
|
Fix horizontal scrollbar in Edge #2
|
2017-02-28 17:03:23 +01:00 |
|
yflory
|
7a0a87bf6c
|
Fix horizontal scrollbar in Edge
|
2017-02-28 16:38:51 +01:00 |
|
yflory
|
f06196c261
|
Remove the context menu buttons when removing selection
|
2017-02-28 15:48:49 +01:00 |
|
yflory
|
c0278ba77f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 13:12:53 +01:00 |
|
yflory
|
efb7380a12
|
Fix default pad not created after registration
|
2017-02-28 13:12:27 +01:00 |
|
ansuz
|
5d39125004
|
Make onSettle Async Again
|
2017-02-28 13:12:04 +01:00 |
|
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
2017-02-28 11:23:50 +01:00 |
|
yflory
|
0224d6489b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 11:06:50 +01:00 |
|
ansuz
|
12aec60a12
|
hack around onSettle not doing its job
|
2017-02-28 11:05:59 +01:00 |
|
yflory
|
0ae7f94184
|
Remove the pointer and text underline on icon:hover in drive
|
2017-02-28 10:50:52 +01:00 |
|
ansuz
|
69b6f80e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 10:47:23 +01:00 |
|
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
2017-02-28 10:47:18 +01:00 |
|
ansuz
|
cfc9f2e622
|
remove code for 'user' app, now that we have login and register
|
2017-02-28 10:46:21 +01:00 |
|
yflory
|
ec7761eeb8
|
Make sure we don't use a wrong title for a new pad
|
2017-02-28 10:43:36 +01:00 |
|
yflory
|
8e7e1d336e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 10:39:53 +01:00 |
|
yflory
|
96f6b5755d
|
Add the blog link in the header and footer
|
2017-02-28 10:39:48 +01:00 |
|
ansuz
|
d49a7d7ec4
|
fix undefined reference
|
2017-02-28 10:30:24 +01:00 |
|
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 20:11:26 +01:00 |
|
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
2017-02-27 20:11:18 +01:00 |
|
ansuz
|
1a259bb3aa
|
check if user has disallowed feedback api
|
2017-02-27 20:02:54 +01:00 |
|
yflory
|
4f7a05ead2
|
Fix issue with the path for the trash in the drive's topbar
|
2017-02-27 18:37:44 +01:00 |
|
yflory
|
8741b50f5b
|
Set the file name as default title if a pad is created from the drive
|
2017-02-27 18:15:18 +01:00 |
|
yflory
|
e8c73f35ce
|
In the tree, display the rename input only once
|
2017-02-27 17:50:58 +01:00 |
|
yflory
|
e38df7ce47
|
Fix creation of new pads in /pad
|
2017-02-27 17:47:11 +01:00 |
|
yflory
|
20518a3e88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 17:23:40 +01:00 |
|
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
2017-02-27 17:23:28 +01:00 |
|
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:32:04 +01:00 |
|
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
2017-02-27 14:31:56 +01:00 |
|
yflory
|
498f4065cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:29:55 +01:00 |
|
yflory
|
95853debf9
|
Update the default pad #1
|
2017-02-27 14:29:48 +01:00 |
|
yflory
|
d4bf7cf9aa
|
Send the initial state only if it is a new pad in /pad
|
2017-02-27 14:29:38 +01:00 |
|
yflory
|
66dc166936
|
Make sure the realtime is synced with onSettle when using cryptget
|
2017-02-27 14:28:12 +01:00 |
|
yflory
|
fadddb297c
|
Readonly mode in /pad had contenteditable set to true
|
2017-02-27 12:41:29 +01:00 |
|
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
2017-02-27 12:06:49 +01:00 |
|
yflory
|
2ad9debe58
|
Remove the placeholders in /code and /slide
|
2017-02-27 11:45:23 +01:00 |
|
yflory
|
38893fb8e5
|
Remove the 'Bootstart tooltips require Tether' error
|
2017-02-27 11:19:29 +01:00 |
|
yflory
|
88b29e8bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 18:55:48 +01:00 |
|
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
2017-02-24 18:55:41 +01:00 |
|
ansuz
|
cc829d51f8
|
jshint compliance
|
2017-02-24 18:23:43 +01:00 |
|
yflory
|
42b6cca18d
|
Fix new pad not working
|
2017-02-24 16:55:43 +01:00 |
|
yflory
|
3fd5669647
|
Hide the trash icon for read-only pads if we have the edit link in drive
|
2017-02-24 16:51:15 +01:00 |
|
yflory
|
02cc9c8344
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 16:18:54 +01:00 |
|
yflory
|
e040c00557
|
Fix blocker issue when creating an account without migrating
|
2017-02-24 16:18:41 +01:00 |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
2017-02-24 15:22:26 +01:00 |
|
ansuz
|
89bee8cf6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 12:08:26 +01:00 |
|
ansuz
|
ba3e24b595
|
media tag experiments
|
2017-02-24 12:08:16 +01:00 |
|
yflory
|
54b0a86c2e
|
Make sure we redirect to the drive if we access the login page from the homepage
|
2017-02-24 11:44:47 +01:00 |
|
yflory
|
55fb0f03ae
|
Fix the path in the drive overriding the content area
|
2017-02-24 11:01:33 +01:00 |
|
yflory
|
d7d7165dc4
|
Login page was using a wrong translation key
|
2017-02-23 18:19:33 +01:00 |
|
yflory
|
ba0b314f5e
|
Fix the 'new' button in drive which was broken in non root categories
|
2017-02-23 18:15:44 +01:00 |
|
yflory
|
d8cc2903cc
|
Display context menu actions in the toolbar when an element is selected
|
2017-02-23 17:25:25 +01:00 |
|
yflory
|
a0340f1419
|
Open link in a new tab in /pad
|
2017-02-23 14:27:18 +01:00 |
|
yflory
|
2d30393243
|
Add support for updated translation key
|
2017-02-23 11:45:00 +01:00 |
|
yflory
|
cc174f3bee
|
Fix typo
|
2017-02-22 12:26:25 +01:00 |
|
yflory
|
bdc00a2413
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-22 12:25:48 +01:00 |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
2017-02-22 12:25:29 +01:00 |
|
yflory
|
e73b4a1131
|
Don't display 'All files' in the menu
|
2017-02-22 11:15:29 +01:00 |
|
ansuz
|
89f3577058
|
remove old poll
|
2017-02-22 11:05:47 +01:00 |
|
ansuz
|
7e77c6828a
|
more correct pluralization
|
2017-02-21 18:55:48 +01:00 |
|
ansuz
|
3d0e7cb9a7
|
pull ckeditor config out of main.js
|
2017-02-21 18:21:30 +01:00 |
|
yflory
|
328e5c6f03
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-21 17:43:05 +01:00 |
|
yflory
|
c72bbd4c37
|
Use the file name as initial title
|
2017-02-21 17:42:58 +01:00 |
|
Pierre Bondoerffer
|
4cbb3b2ed2
|
Ensure we use English for reference
|
2017-02-21 14:53:18 +01:00 |
|
Pierre Bondoerffer
|
ffe17a6bc9
|
Use JSON.stringify instead and fix linter
|
2017-02-21 14:37:08 +01:00 |
|
Pierre Bondoerffer
|
a84f8e2808
|
Assert translation now outputs JavaScript which is easier to edit for translators
|
2017-02-21 14:23:58 +01:00 |
|
yflory
|
47b8fefd9e
|
Load messages.js only once, in cryptpad-common
|
2017-02-21 14:16:23 +01:00 |
|
yflory
|
11d9c9e813
|
Merge branch 'master' into staging
|
2017-02-21 10:44:03 +01:00 |
|
yflory
|
2103f0afa8
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-02-21 10:42:35 +01:00 |
|
yflory
|
0bdf59c1dd
|
Fix broken link in the 'New' button on cryptpad.fr
|
2017-02-21 10:42:06 +01:00 |
|
yflory
|
454d1c2052
|
Do not load all the translations anymore, only the needed one
|
2017-02-20 18:29:06 +01:00 |
|
yflory
|
434c3a220c
|
Remove old translation keys #2
|
2017-02-20 16:15:13 +01:00 |
|
yflory
|
d81d17b86c
|
Remove old translations keys no longer used
|
2017-02-17 17:39:27 +01:00 |
|
yflory
|
9702305abc
|
Use better translation keys in settings
|
2017-02-17 17:38:59 +01:00 |
|
yflory
|
a6497f7a52
|
Add a way to show the drive tips again
|
2017-02-17 16:56:59 +01:00 |
|
yflory
|
c17f28e5fe
|
Fix race condition #2
|
2017-02-17 15:39:34 +01:00 |
|
yflory
|
239e2bcc1f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
2017-02-17 15:18:09 +01:00 |
|
yflory
|
1540ae3f6f
|
Fix issue with null entries in Cryptpad_RECENTPADS
|
2017-02-17 15:16:30 +01:00 |
|
yflory
|
dd014f6ef2
|
Fix race conditon
|
2017-02-17 15:16:03 +01:00 |
|
ansuz
|
94417d9a8b
|
jshint compliance
|
2017-02-17 14:28:18 +01:00 |
|
ansuz
|
8167ed9048
|
implement cache-busting everywhere
|
2017-02-17 12:39:01 +01:00 |
|
ansuz
|
34b6507fa3
|
implement cache-busting everywhere
|
2017-02-17 12:38:58 +01:00 |
|
ansuz
|
c9b8889380
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:26:43 +01:00 |
|
ansuz
|
09fade6127
|
add cache-busting to chainpad-crypto
|
2017-02-17 11:25:35 +01:00 |
|
yflory
|
2daa9f8658
|
Link to main page was opened in the inner iframe
|
2017-02-17 10:57:56 +01:00 |
|
yflory
|
deda40375a
|
Use the new onSettle from chainpad to determine if the realtime is synced
|
2017-02-17 10:31:07 +01:00 |
|
yflory
|
550c65aae0
|
Add a default pad in CryptDrive after signing up
|
2017-02-16 18:10:12 +01:00 |
|
yflory
|
92d50ded64
|
Merge branch 'soon' into staging
|
2017-02-16 16:48:12 +01:00 |
|
yflory
|
97762f9f9a
|
Make sure all the elements in RECENTPADS are non-null objects
|
2017-02-16 16:07:43 +01:00 |
|
yflory
|
e4dbe97d71
|
Update display name in realtime across tabs and remember 'anonymous' name
|
2017-02-16 15:35:03 +01:00 |
|
yflory
|
7762ffcbff
|
Ability to use Ctrl+click on the cryptpad logo in apps
|
2017-02-15 18:31:36 +01:00 |
|
yflory
|
7497e0d1c5
|
Add a dropdown user menu to the top bar in static pages
|
2017-02-15 17:57:42 +01:00 |
|
yflory
|
0e76b18278
|
Hide the links in the html topbar on small screens
|
2017-02-15 14:23:56 +01:00 |
|
yflory
|
7758d056fa
|
Ability to import/export a user realtime object
|
2017-02-15 12:40:28 +01:00 |
|
yflory
|
0a43570990
|
Add the new files for the settings app
|
2017-02-14 19:07:17 +01:00 |
|
yflory
|
cd9cea8fa4
|
Create a settings app to manage user objects
|
2017-02-14 19:04:57 +01:00 |
|
yflory
|
71b84afdb2
|
Redirect to the pad when logging in or signing up from a pad
|
2017-02-14 11:29:08 +01:00 |
|
yflory
|
92050eb04f
|
Fix the trash button in toolbar not always working
|
2017-02-14 10:56:38 +01:00 |
|
yflory
|
aae3fba284
|
Fix the storage when the hash is invalid
|
2017-02-13 17:54:01 +01:00 |
|
yflory
|
25dd103f6f
|
Reduce font-size for register explanations
|
2017-02-13 12:54:34 +01:00 |
|
ansuz
|
7d0c29513c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 12:42:17 +01:00 |
|
ansuz
|
7d21206cae
|
add registration introductory text
|
2017-02-13 12:42:07 +01:00 |
|
yflory
|
2851ceb95a
|
Merge branch 'soon' into staging
|
2017-02-13 11:59:49 +01:00 |
|
yflory
|
2807ad9dc3
|
Add spinner and translate the register page
|
2017-02-13 11:41:48 +01:00 |
|
ansuz
|
562e5b8c70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 11:17:16 +01:00 |
|
ansuz
|
5d4d530c89
|
switch registration text to an explanation of how login works
|
2017-02-13 11:17:00 +01:00 |
|
yflory
|
bff9d05210
|
Make sure the login_name is in the object
|
2017-02-13 11:15:30 +01:00 |
|
yflory
|
b1b294aade
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 11:10:40 +01:00 |
|
ansuz
|
20083264b2
|
load fontawesome icons on register page
|
2017-02-13 11:09:44 +01:00 |
|
yflory
|
3aa03225c9
|
Add a spinner when hashing the password and translate homepage
|
2017-02-13 11:09:30 +01:00 |
|
ansuz
|
fbcf4ccec4
|
force usernames to be lowercase
|
2017-02-13 11:01:30 +01:00 |
|
ansuz
|
5614bea271
|
redirect users to login and register from toolbar
|
2017-02-13 10:51:54 +01:00 |
|
ansuz
|
f723585758
|
add api to check whether the realtime has synced with the server
|
2017-02-13 10:42:17 +01:00 |
|
ansuz
|
3b1bd2f720
|
use additional translation keys for registration
|
2017-02-13 10:15:25 +01:00 |
|
ansuz
|
b5b2454f0b
|
use bootstrap for login and register pages
|
2017-02-10 18:29:49 +01:00 |
|
ansuz
|
c556f78562
|
log in directly from home page, sign up at /register/
|
2017-02-10 16:49:17 +01:00 |
|
ansuz
|
d0edf75c89
|
signup link directs users to register page, not user
|
2017-02-10 16:48:28 +01:00 |
|
ansuz
|
1232aa8a79
|
jshint compliance
|
2017-02-10 14:25:02 +01:00 |
|
yflory
|
8eec7ec7c8
|
Fix typo
|
2017-02-10 11:00:34 +01:00 |
|
ansuz
|
88af104ce8
|
basic registration page to replace user page
|
2017-02-09 18:50:28 +01:00 |
|
ansuz
|
a995df25f6
|
disable new OT in pad and code app
|
2017-02-09 17:20:13 +01:00 |
|
ansuz
|
f92ba193c3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-09 17:16:03 +01:00 |
|
ansuz
|
e100110741
|
implement log in as an api
|
2017-02-09 16:31:57 +01:00 |
|
yflory
|
d54262c8df
|
Use the same disconnecter error translation key for all the apps
|
2017-02-09 15:34:14 +01:00 |
|
yflory
|
f8366e0cfc
|
Remove support for legacy store and add a way to import legacy pads
|
2017-02-09 15:23:09 +01:00 |
|
yflory
|
342cb44cf7
|
Ability to migrate a anon drive directly from the drive
|
2017-02-09 12:58:08 +01:00 |
|
ansuz
|
c642bce984
|
restore disabled listener
|
2017-02-09 10:31:00 +01:00 |
|
yflory
|
67d881b2cf
|
Remove the drive entry from the user menu if already in drive
|
2017-02-08 16:25:52 +01:00 |
|
yflory
|
e865b89f43
|
Add the contextmenu button in the drive dynamically
|
2017-02-08 15:41:50 +01:00 |
|
yflory
|
3af7c9cff8
|
Replace the expand/collapse ckeditor button by our own to save space
|
2017-02-08 15:32:55 +01:00 |
|
yflory
|
914c442615
|
Do not redirect to home page when logging out from another tab
|
2017-02-08 12:54:07 +01:00 |
|
yflory
|
702798f65a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 18:47:24 +01:00 |
|
yflory
|
1e2cc6bea4
|
Fix race condition with the iframe store
|
2017-02-07 18:47:10 +01:00 |
|
ansuz
|
dae17588c6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 18:27:28 +01:00 |
|
ansuz
|
32a5c5ff62
|
better integration between /user/ and home
|
2017-02-07 17:50:37 +01:00 |
|
ansuz
|
fe7ba98338
|
remove dead code from /user/
|
2017-02-07 17:50:02 +01:00 |
|
ansuz
|
9b047bfb53
|
don't autocorrect usernames. add trailing slash to /drive
|
2017-02-07 17:28:32 +01:00 |
|
ansuz
|
6e97082ff9
|
remove dead code from login function
|
2017-02-07 17:27:36 +01:00 |
|
yflory
|
b3e73b0f0b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 16:49:31 +01:00 |
|
yflory
|
367a02c031
|
Add mobile support for the code app
|
2017-02-07 16:49:25 +01:00 |
|
yflory
|
628148d001
|
Display the contextmenu button only if contextmenu exists
|
2017-02-07 13:09:14 +01:00 |
|
ansuz
|
8a1acc3c37
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-07 10:40:03 +01:00 |
|
ansuz
|
6f07a3b7b4
|
erase lingering sessionStorage values when logging out
|
2017-02-07 10:39:42 +01:00 |
|
yflory
|
ac79fbb5a2
|
Improve mobile support for the toolbar and the drive
|
2017-02-06 18:06:59 +01:00 |
|
yflory
|
9f1789b2d2
|
Fix creation of pads from non-root category in the drive
|
2017-02-06 14:47:37 +01:00 |
|
yflory
|
7e7d1f7a16
|
Display the error when opening a document with the wrong app
|
2017-02-06 12:43:56 +01:00 |
|
yflory
|
6f0d33dc1d
|
Fix missing placeholder in the Slide app
|
2017-02-06 12:14:33 +01:00 |
|
yflory
|
7d6e15e465
|
Throw an error when trying to open a document with the wrong app
|
2017-02-06 12:06:39 +01:00 |
|
yflory
|
ad82a275bc
|
Replace the Apps button by a New button again
|
2017-02-06 11:39:04 +01:00 |
|
yflory
|
fd33ffd56f
|
Fix issue creating a patch everytime the user clicked in an app
|
2017-02-06 11:12:08 +01:00 |
|
yflory
|
fbbf8a2829
|
Replace initialState by a placeholder in slide and code
|
2017-02-03 18:45:30 +01:00 |
|
yflory
|
87abfac5e0
|
Fix lint error
|
2017-02-03 16:53:47 +01:00 |
|
yflory
|
02439e0f61
|
Improve the homepage with new images and translations
|
2017-02-03 16:03:36 +01:00 |
|
yflory
|
f57c8c0e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-02 18:40:45 +01:00 |
|
yflory
|
2c6b4b9c6a
|
Hide disabled applications from the context menu in drive
|
2017-02-02 18:40:39 +01:00 |
|
ansuz
|
85b49d5ec8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-02 18:37:09 +01:00 |
|
yflory
|
91299f5f30
|
Ability to access the drive from any pad
|
2017-02-02 18:22:59 +01:00 |
|
yflory
|
b0fb56fa63
|
Allow logge din users to access the home page
|
2017-02-02 18:09:27 +01:00 |
|
ansuz
|
72c4175b6f
|
remove slide/oldmain.js
|
2017-02-02 14:44:43 +01:00 |
|
yflory
|
e607ba5dad
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-02 11:33:44 +01:00 |
|
yflory
|
9cea8d82c2
|
Fix left-click disabled in Edge after renaming a file
|
2017-02-02 11:33:37 +01:00 |
|
ansuz
|
2dfe182d8d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-02 11:27:17 +01:00 |
|
ansuz
|
0ca1775657
|
add page for listing missing translations
|
2017-02-02 11:27:08 +01:00 |
|
yflory
|
6a5769405b
|
Fix a race condition issue introduced with reconnecting patch
|
2017-02-01 18:48:30 +01:00 |
|
yflory
|
8881334ca8
|
Fix renaming folders from the tree
|
2017-02-01 17:46:05 +01:00 |
|
yflory
|
65054119cf
|
Fix a bug preventing reconnection in drive
|
2017-02-01 17:21:54 +01:00 |
|
yflory
|
89da142204
|
Fix pad creation from the context menu
|
2017-02-01 15:52:47 +01:00 |
|
yflory
|
757ae7a3ad
|
Fix a cross origin frame issue with dropdowns
|
2017-02-01 12:19:54 +01:00 |
|
ansuz
|
3321d01040
|
add background image
|
2017-01-31 19:48:55 +01:00 |
|
yflory
|
8427b6ae8e
|
Fix 'sort by type' in drive
|
2017-01-31 17:00:30 +01:00 |
|
yflory
|
39c85ca3f7
|
Fix race condition causing missing translations in homepage
|
2017-01-31 12:01:33 +01:00 |
|
yflory
|
dc39c4e179
|
Fix a race condition causing the drive toolbar to be missing
|
2017-01-31 11:50:20 +01:00 |
|
yflory
|
2e247d44c7
|
Hide the backup icon when logged in
|
2017-01-31 10:59:23 +01:00 |
|
yflory
|
8ed593bfff
|
Keep the anon drive when signing up
|
2017-01-31 10:46:41 +01:00 |
|
yflory
|
5e69b78334
|
Remove the domain from the href in store
|
2017-01-30 18:52:27 +01:00 |
|
yflory
|
a9c9d19212
|
Hide the template from the list in the drive until it's done
|
2017-01-30 17:46:08 +01:00 |
|
yflory
|
487650df78
|
Remove the remember me checkbox
|
2017-01-30 15:32:42 +01:00 |
|
yflory
|
58d8a30b5b
|
Redirect to the main page when logging out
|
2017-01-30 15:26:32 +01:00 |
|
yflory
|
29578a7400
|
Merge branch 'hpbs' into newtoolbar
|
2017-01-30 14:45:02 +01:00 |
|
yflory
|
2d79649949
|
Fix the 'NoScript' bug with the drive
|
2017-01-30 12:28:21 +01:00 |
|
yflory
|
5ef074370b
|
Name a place before creating it in the drive
|
2017-01-27 17:51:08 +01:00 |
|
yflory
|
02906b3945
|
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
|
2017-01-27 16:57:22 +01:00 |
|
yflory
|
a4286f1c83
|
Merge branch 'soon' into newtoolbar
|
2017-01-27 16:52:49 +01:00 |
|
yflory
|
0e9e0e545f
|
Load the new pad when the hash is changed
|
2017-01-27 14:57:45 +01:00 |
|
yflory
|
e41cbb92d8
|
Use default FILES_DATA name if not provided
|
2017-01-26 16:52:23 +01:00 |
|
yflory
|
fa1582f307
|
Replace 'filename' by 'title' in drive when there is no filename
|
2017-01-26 16:43:26 +01:00 |
|
yflory
|
c44f3a1044
|
Delete multiple elements could also remove unselected ones
|
2017-01-26 16:18:43 +01:00 |
|
yflory
|
b79e1e48c7
|
Update colors in drive
|
2017-01-26 14:52:34 +01:00 |
|
yflory
|
fb48484d2a
|
Fix the rename feature in drive not working with tables
|
2017-01-26 14:51:59 +01:00 |
|
yflory
|
3f44444f41
|
Display the 'New' button in the trash
|
2017-01-26 13:19:40 +01:00 |
|
yflory
|
00efc96919
|
Move the toolbar and add a breadcrumb
|
2017-01-26 12:56:19 +01:00 |
|
yflory
|
6f5ff07c2b
|
Display the elements as a table instead of a list
|
2017-01-25 18:33:59 +01:00 |
|
yflory
|
95056315cf
|
Move the folder icon style to the less file
|
2017-01-25 17:29:06 +01:00 |
|
yflory
|
8c7305bf1b
|
Use less to write the drive stylesheet
|
2017-01-25 16:21:46 +01:00 |
|
yflory
|
11f0a9ae5f
|
Revert the changes adding anonymous pads
|
2017-01-25 15:35:40 +01:00 |
|
yflory
|
f42665ba49
|
Remove the unowned pads category
|
2017-01-25 14:27:06 +01:00 |
|
yflory
|
cb85ad3fdf
|
Merge branch 'newtoolbar' into ownedpads
|
2017-01-25 10:23:03 +01:00 |
|
yflory
|
75f1eed712
|
Merge branch 'newtoolbar' into hpbs
|
2017-01-25 10:21:50 +01:00 |
|
yflory
|
373b07ed28
|
Fix lint errors
|
2017-01-25 10:21:31 +01:00 |
|
yflory
|
097f78d777
|
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
|
2017-01-25 10:01:49 +01:00 |
|
yflory
|
015e6fc262
|
Make sure we have the same hash in all the tabs when disconnecting
|
2017-01-24 18:17:23 +01:00 |
|
yflory
|
88021f2264
|
Anonymous pads fo anonymous users
|
2017-01-24 18:14:29 +01:00 |
|
yflory
|
8ccd845d52
|
Merge branch 'newtoolbar' into hpbs
|
2017-01-24 12:54:32 +01:00 |
|
yflory
|
ce1e792419
|
Merge branch 'soon' into newtoolbar
|
2017-01-24 12:54:07 +01:00 |
|
yflory
|
9d275daebb
|
Backport changes for the login page from hpbs branch
|
2017-01-24 12:47:53 +01:00 |
|
yflory
|
a5c03c1540
|
Make sure data is migrated before leaving registration page
|
2017-01-24 12:38:06 +01:00 |
|
yflory
|
69fb8b4d2f
|
Merge branch 'master' into soon
|
2017-01-23 15:13:26 +01:00 |
|
yflory
|
f8455875a9
|
Fix the NoScript (iframe not loaded) bug with inner iframes
|
2017-01-23 15:07:38 +01:00 |
|
yflory
|
c77abfa7f4
|
Remove a second scrollbar in polls
|
2017-01-23 11:05:13 +01:00 |
|
yflory
|
5e36d9ea29
|
Fix polls table not updated with local events
|
2017-01-23 10:53:01 +01:00 |
|
yflory
|
39ca2e6dd6
|
Fix bootstrap conflict with context menus
|
2017-01-23 10:52:37 +01:00 |
|
yflory
|
d1bed5ae4b
|
Fix polls table not updated with local events
|
2017-01-23 10:51:44 +01:00 |
|
yflory
|
26bea774cb
|
Merge branch 'newtoolbar' into hpbs
|
2017-01-19 15:52:12 +01:00 |
|
yflory
|
99b8898e54
|
Apply new title when clicking on the page without pressing enter
|
2017-01-19 15:41:25 +01:00 |
|
yflory
|
ea8667302c
|
Display only a placeholder when the poll title is default
|
2017-01-19 15:35:38 +01:00 |
|
yflory
|
7d66d391fc
|
Merge branch 'newtoolbar' into hpbs
|
2017-01-19 15:17:30 +01:00 |
|
yflory
|
1e1bfd275c
|
Don't show the tab notification when someone has joined the pad
|
2017-01-19 15:17:21 +01:00 |
|
yflory
|
5d5d03163e
|
Add favicon and notifications in polls
|
2017-01-19 14:52:12 +01:00 |
|
yflory
|
3338000018
|
Add Esc and Arrow icons in the slide's present mode
|
2017-01-19 12:49:40 +01:00 |
|
yflory
|
efdae19f0c
|
Update the lists in the code and slide toolbars to use the new dropdown
|
2017-01-19 12:14:14 +01:00 |
|
yflory
|
36c8ade26c
|
Update the lists in the code and slide toolbars to use the new dropdown
|
2017-01-19 12:13:57 +01:00 |
|
yflory
|
fa8a0d5880
|
Merge branch 'newtoolbar' into hpbs
|
2017-01-19 10:53:55 +01:00 |
|
yflory
|
69bee7d79a
|
Add data into the homepage
|
2017-01-18 18:02:32 +01:00 |
|
yflory
|
88d5b4cc9c
|
Add a 'New pad' button in the toolbar
|
2017-01-18 11:00:46 +01:00 |
|
yflory
|
73d424b506
|
Improve the login UI (css and translations)
|
2017-01-17 16:21:12 +01:00 |
|
yflory
|
e006ed7076
|
Ability to log in from the main page
|
2017-01-17 11:52:44 +01:00 |
|
yflory
|
a9063e0459
|
Reload all tabs when the user logs in or out
|
2017-01-16 14:08:44 +01:00 |
|
yflory
|
efed1f5efe
|
Add handlers to login and logout buttons
|
2017-01-13 17:39:41 +01:00 |
|
yflory
|
767ba8b549
|
Select what we want to display in the toolbar
|
2017-01-13 17:14:44 +01:00 |
|
yflory
|
2afdc11327
|
Replace the username button by a dropdown menu
|
2017-01-13 17:11:12 +01:00 |
|
yflory
|
4adde0f0c0
|
Use the new dropdown for userlist and share
|
2017-01-13 15:05:00 +01:00 |
|
yflory
|
70b73206b7
|
Merge branch 'brandones-master' into soon
|
2017-01-13 10:33:38 +01:00 |
|
yflory
|
efffd4974f
|
Add createDropdown and createLanguageSelector in cryptpad-common
|
2017-01-12 18:28:38 +01:00 |
|
yflory
|
29c8f0bbef
|
Use a FontAwesome spinner to replace the old unaligned one
|
2017-01-12 17:05:16 +01:00 |
|
Brandon Istenes
|
b5acdb8cc0
|
Disable zooming on mobile
|
2017-01-12 18:50:39 +03:00 |
|
Brandon Istenes
|
40985f1811
|
Dubious height setting for iOS
|
2017-01-12 18:49:46 +03:00 |
|
Brandon Istenes
|
52d8d8db1d
|
Get rid of margins on mobile
|
2017-01-12 18:49:46 +03:00 |
|
Brandon Istenes
|
cd0931c951
|
UI improvements for mobile browsers
|
2017-01-12 18:49:46 +03:00 |
|
yflory
|
6352656737
|
Remove the default context menu in the entire drive
|
2017-01-12 15:55:35 +01:00 |
|
yflory
|
ed79b8870c
|
Merge branch 'master' into soon
|
2017-01-12 15:37:48 +01:00 |
|
yflory
|
605072cfbf
|
Fix empty title with new documents
|
2017-01-12 15:15:10 +01:00 |
|
yflory
|
4963c77b61
|
Fix the title reset bug
|
2017-01-12 14:29:40 +01:00 |
|
Caleb James DeLisle
|
35a853ffff
|
Stop failing tests over missing translations because otherwise they'll almost never be passing.
|
2017-01-12 12:06:44 +01:00 |
|
yflory
|
3f1e287811
|
Fix an issue causing a user object to be turned into a pad
|
2017-01-12 11:09:45 +01:00 |
|
Caleb James DeLisle
|
994f6991c8
|
Merge branch 'master' into soon
|
2017-01-11 18:01:08 +01:00 |
|
Caleb James DeLisle
|
6c5e8d3118
|
Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
|
2017-01-11 18:00:41 +01:00 |
|
yflory
|
569ea21705
|
Replace the language selector by our custom dropdown menu
|
2017-01-11 10:59:09 +01:00 |
|
ansuz
|
33b8de888e
|
clean up unused files
|
2017-01-11 07:49:56 +01:00 |
|
yflory
|
26dd4ea11f
|
Fix lint errors
|
2017-01-10 15:33:21 +01:00 |
|
yflory
|
4278ac7637
|
Merge branch 'soon' into fileManager
|
2017-01-10 15:07:48 +01:00 |
|
yflory
|
2be5db9540
|
Ability to open files in readonly mode
Fix CSS issues
|
2017-01-10 15:04:02 +01:00 |
|
ansuz
|
63b9d4e9fd
|
remove path for backwards compatibility
|
2017-01-10 10:54:08 +01:00 |
|
yflory
|
f74d0a46a4
|
Remove the alert when pressing del in 'all files'
|
2017-01-09 18:38:05 +01:00 |
|
ansuz
|
b39067d2a1
|
jshint compliance
|
2017-01-09 18:07:45 +01:00 |
|
ansuz
|
74a12f50ac
|
only migrate keys which don't already exist
|
2017-01-09 17:35:58 +01:00 |
|
ansuz
|
1c3f1a15cd
|
make sure that /pad is resized after loading
|
2017-01-09 17:02:01 +01:00 |
|
yflory
|
5b08fed7fa
|
Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
|
2017-01-09 16:29:16 +01:00 |
|
ansuz
|
a3cd100c94
|
apply yflory's safari patch
|
2017-01-09 11:46:51 +01:00 |
|
ansuz
|
0373556475
|
support old hashes in /poll
|
2017-01-09 11:46:21 +01:00 |
|
yflory
|
d5561910d4
|
Move the file manager into /drive and add a toolbar
|
2017-01-06 18:26:41 +01:00 |
|
yflory
|
1e70af0c16
|
Use the same network for the apps and the file store
|
2017-01-06 13:52:53 +01:00 |
|
yflory
|
bf764d26e7
|
Merge branch 'staging' into workgroups
|
2017-01-06 11:17:17 +01:00 |
|
yflory
|
3836b20b08
|
enable the file store
|
2017-01-06 11:16:56 +01:00 |
|
yflory
|
b0d4dad417
|
Fix creation of a new file manager object
|
2017-01-05 18:43:00 +01:00 |
|
yflory
|
5a8f0df19e
|
Add support for reconnecting websocket
|
2017-01-05 18:42:18 +01:00 |
|
ansuz
|
b33661d9d5
|
don't toggle maximization state after setting
|
2017-01-05 15:21:17 +01:00 |
|
ansuz
|
e56cc49f79
|
catch errors that popped up because of a cross-origin iframe
|
2017-01-05 14:14:26 +01:00 |
|
ansuz
|
5080751a90
|
hide unnecessary scrollbar
|
2017-01-05 10:58:10 +01:00 |
|
ansuz
|
95617a11c8
|
fix broken paths in old poll
|
2017-01-05 10:57:13 +01:00 |
|
yflory
|
7a0442afe0
|
Drag and drop files into a workgroup
|
2017-01-04 18:24:20 +01:00 |
|
ansuz
|
05a956879a
|
prepare new poll app for release
move old poll into poll/old
|
2017-01-04 15:48:50 +01:00 |
|
ansuz
|
5cd714b18a
|
configure filestore usage via customize/application_config.js
|
2017-01-03 12:10:11 +01:00 |
|
ansuz
|
2b5085625c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-01-02 15:43:06 +01:00 |
|
yflory
|
69b1764c9d
|
Missing entries in the context menu with users
|
2017-01-02 15:42:29 +01:00 |
|
ansuz
|
c6499d6789
|
make panel styles reusable
|
2016-12-30 15:30:35 +01:00 |
|
ansuz
|
34967ac354
|
encapsulate rendering functions so we can pass in cryptpad-common
|
2016-12-30 13:27:01 +01:00 |
|
ansuz
|
66b8c93205
|
remember time of first visit
|
2016-12-30 13:23:09 +01:00 |
|
ansuz
|
ba4df1a22c
|
create examples directory with old prototypes
|
2016-12-30 13:22:15 +01:00 |
|
ansuz
|
0abf45bdc5
|
better fsStore debugging
|
2016-12-30 12:27:58 +01:00 |
|
ansuz
|
e3f79f914a
|
fix user hash
|
2016-12-29 18:12:30 +01:00 |
|
ansuz
|
d232a5a83e
|
Revert "simplify key generation and remember user's additional keys"
This reverts commit 75786ff9ff.
|
2016-12-29 17:51:58 +01:00 |
|
ansuz
|
91a806ab86
|
focus on OK button when we pop an alert
|
2016-12-29 17:10:59 +01:00 |
|
ansuz
|
850bd42149
|
don't try to display things that don't exist
|
2016-12-29 17:05:28 +01:00 |
|
ansuz
|
75786ff9ff
|
simplify key generation and remember user's additional keys
|
2016-12-29 17:04:48 +01:00 |
|
ansuz
|
621476424d
|
make strings translatable and refocus on correct input
|
2016-12-29 17:04:01 +01:00 |
|
ansuz
|
a97696c712
|
show user's display name and account name
|
2016-12-29 17:03:17 +01:00 |
|
ansuz
|
3560f0580f
|
commit prototype upload script
|
2016-12-28 17:23:57 +01:00 |
|
ansuz
|
2f9f3d921a
|
trim excess whitespace from usernames
|
2016-12-28 17:13:41 +01:00 |
|
ansuz
|
89e5830409
|
make alertify display time configurable
|
2016-12-28 17:13:00 +01:00 |
|
ansuz
|
49d80d91d9
|
don't load customize/pad.js anymore
|
2016-12-28 15:53:27 +01:00 |
|
ansuz
|
f020fd5a75
|
remove /customize/pad.js from main apps
|
2016-12-28 15:12:22 +01:00 |
|
ansuz
|
aae443c8e9
|
replace old poll app with new
|
2016-12-28 11:44:48 +01:00 |
|
ansuz
|
387f4ebf5d
|
add this important js file I forgot
|
2016-12-28 11:01:14 +01:00 |
|
ansuz
|
8f0de589dc
|
add missing cp class to more html
|
2016-12-28 10:45:14 +01:00 |
|
ansuz
|
e9376a66c2
|
apply 'cp' class for unified styles
|
2016-12-27 14:29:20 +01:00 |
|
ansuz
|
8b034a9554
|
better flow and animations for login page
|
2016-12-27 12:32:20 +01:00 |
|
ansuz
|
db12b5e896
|
move text for login page into translation file
|
2016-12-27 12:31:16 +01:00 |
|
ansuz
|
5e1d8292c5
|
guard against trying to parse special fragments
|
2016-12-26 14:23:17 +01:00 |
|
ansuz
|
51067430f9
|
more restructuring of user app
|
2016-12-26 14:19:29 +01:00 |
|
ansuz
|
a4ed2388e2
|
use 'box' class
|
2016-12-26 14:19:02 +01:00 |
|
ansuz
|
eb620bee77
|
restructure user application
|
2016-12-26 14:17:39 +01:00 |
|
yflory
|
a10eac2773
|
Fix lint errors
|
2016-12-22 18:16:38 +01:00 |
|
ansuz
|
52a593c2c2
|
fix jshint complaints
|
2016-12-22 17:27:56 +01:00 |
|
ansuz
|
53a4d4738a
|
really make sure you're logged out
|
2016-12-22 17:22:32 +01:00 |
|
ansuz
|
63cd5c16ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
2016-12-22 17:20:30 +01:00 |
|
yflory
|
81259fc25f
|
Refresh unsorted and templates when files data changes
|
2016-12-22 17:20:05 +01:00 |
|
ansuz
|
5534da8abf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
2016-12-22 16:54:51 +01:00 |
|
yflory
|
9b6c9e3891
|
Add support for templates in the file manager
|
2016-12-22 16:53:38 +01:00 |
|
ansuz
|
acfc27f5c5
|
fix merge conflicts
|
2016-12-22 16:53:03 +01:00 |
|
ansuz
|
3197b62fbb
|
latest work
|
2016-12-22 16:44:49 +01:00 |
|
ansuz
|
29d406b7a9
|
implement cryptput
|
2016-12-22 16:00:13 +01:00 |
|
ansuz
|
84d5e4b35d
|
better tools for playing with template code
|
2016-12-22 11:03:44 +01:00 |
|
yflory
|
1772cc93c8
|
Fix the taildoc bug
|
2016-12-22 11:02:12 +01:00 |
|
yflory
|
87abfff66b
|
Fix Flash Of Unstyled Content (fouc)
|
2016-12-21 18:33:21 +01:00 |
|
ansuz
|
86cda4357b
|
handle more possible cases
|
2016-12-21 18:24:48 +01:00 |
|
ansuz
|
1682d23c1c
|
remove old user prototype
|
2016-12-21 18:06:05 +01:00 |
|
yflory
|
046220f239
|
Add info boxes for the different categories
|
2016-12-21 11:46:49 +01:00 |
|
yflory
|
403ba53980
|
Fix typo error
|
2016-12-21 10:22:48 +01:00 |
|
yflory
|
e9418af88b
|
Add an info box in the file manager
|
2016-12-20 18:59:50 +01:00 |
|
yflory
|
c359c27997
|
Use user object as default store in file manager
|
2016-12-20 17:27:45 +01:00 |
|
yflory
|
4aed585574
|
Fix style issues in the toolbar
|
2016-12-20 14:40:00 +01:00 |
|
yflory
|
f9db7e588e
|
Fix unused backup in localStorage
|
2016-12-20 14:37:29 +01:00 |
|
yflory
|
c7e63f63fd
|
Use the user object in file manager if it exists
|
2016-12-20 11:30:04 +01:00 |
|
ansuz
|
6778a7062d
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
|
2016-12-20 11:23:54 +01:00 |
|
ansuz
|
bd6992da0a
|
create a random hash
|
2016-12-20 11:13:15 +01:00 |
|
ansuz
|
2cd50498c2
|
add log(in|out) functions to common
|
2016-12-20 11:11:40 +01:00 |
|
ansuz
|
dfea802c77
|
better crypto hygeine, start thinking more about ui
|
2016-12-20 11:09:41 +01:00 |
|
yflory
|
e3f484d876
|
File manager in the home page, lint
|
2016-12-19 17:53:03 +01:00 |
|
ansuz
|
7df460c766
|
implement createChannelId api
|
2016-12-19 14:55:39 +01:00 |
|
ansuz
|
3698fe8b0e
|
Merge branch 'soon' into login
|
2016-12-19 12:51:57 +01:00 |
|
ansuz
|
5a14db9f07
|
Merge branch 'test-filemanager' into login
|
2016-12-19 12:37:28 +01:00 |
|
ansuz
|
dd46b9425a
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
2016-12-19 12:37:02 +01:00 |
|
yflory
|
4646d5c866
|
Add suport for read-only mode in the file manager
|
2016-12-19 12:35:13 +01:00 |
|
ansuz
|
2a624a0b60
|
add example usage for cryptget.js
|
2016-12-19 12:25:36 +01:00 |
|
ansuz
|
303953a431
|
Merge branch 'soon' into login
|
2016-12-19 11:04:46 +01:00 |
|
ansuz
|
6b9529b121
|
implement ajax-like functionality for zk docs
|
2016-12-19 10:59:18 +01:00 |
|
yflory
|
5bc7766f44
|
Use a consistent toolbar across all apps
|
2016-12-16 18:35:49 +01:00 |
|
ansuz
|
8a7fda6341
|
Merge branch 'soon' into login
|
2016-12-16 18:10:35 +01:00 |
|
ansuz
|
a220742f68
|
fix reversed color settings
|
2016-12-16 15:31:22 +01:00 |
|
ansuz
|
308db7fa79
|
fix uncolored /pad/ content in IE
|
2016-12-16 15:25:06 +01:00 |
|
ansuz
|
67baf30d65
|
basic outline of logins
|
2016-12-16 15:19:17 +01:00 |
|
ansuz
|
2968488278
|
convert uint8 arrays to hex
|
2016-12-16 15:18:06 +01:00 |
|
yflory
|
d95a3ac92e
|
Fix an issue when deleting a key from the proxy
|
2016-12-16 11:41:45 +01:00 |
|
yflory
|
82f3d5f852
|
Open the file manager of someone else
|
2016-12-13 18:59:04 +01:00 |
|
ansuz
|
c0d96fb10d
|
Merge branch 'login' into test-filemanager
|
2016-12-13 11:21:18 +01:00 |
|
yflory
|
c3e3aa69c3
|
Merge branch 'fileManager' into fmIndex
|
2016-12-12 18:27:19 +01:00 |
|
ansuz
|
5d335ba796
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
2016-12-12 18:25:07 +01:00 |
|
yflory
|
8e6830d080
|
Fix file manager with a chosen hash
|
2016-12-12 18:24:45 +01:00 |