Commit Graph

2168 Commits (56aaeea003ae4e35be0b57d85807e0f513eb3b2a)

Author SHA1 Message Date
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 4c7022ade9 Merge pull request #109 from pbondoer/spanish
Espanol!
2017-04-13 18:10:35 +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
Pierre Bondoerffer 65e848fd4d
linter linted the lints 2017-04-13 17:50:28 +02:00
Pierre Bondoerffer 40c06c4515
Spanish! 2017-04-13 17:42:38 +02:00
yflory 633d60ccd0 Remove a TODO 2017-04-13 17:19:32 +02:00
yflory 3e421c7289 Fix lint errors in ckeditor config 2017-04-13 17:09:35 +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
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