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 |
|
ansuz
|
b3867429ee
|
bump cryptpad version
|
2017-04-10 19:18:49 +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 |
|
ansuz
|
3217b92bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 18:45:43 +02:00 |
|
ansuz
|
b8bf179e3b
|
Merge branch 'docker' of https://github.com/coldfix/cryptpad into staging
|
2017-04-10 18:45:30 +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 |
|
yflory
|
6a3c1bfe06
|
Remove chainpad from bower.json dependencies
|
2017-04-10 18:24:05 +02:00 |
|
ansuz
|
cde9ea9887
|
update footer version
|
2017-04-10 18:09:22 +02:00 |
|
ansuz
|
2a7793acd8
|
set a more permissive CSP policy by default. add a note about it
|
2017-04-10 18:08:01 +02:00 |
|
ansuz
|
8ac0741511
|
move docker section down
|
2017-04-10 18:07:32 +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 |
|