Commit Graph

2191 Commits (80115d0071b86c498ad23e5469156194814424b5)

Author SHA1 Message Date
ansuz 50793f506d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-14 18:44:20 +02:00
ansuz 821c1a3ec6 annotate code which we hope to be able to deprecate in the future 2017-04-14 18:44:08 +02:00
ansuz 853e9782e0 Merge pull request #111 from pbondoer/spanish
Spanish pinpad
2017-04-14 18:43:08 +02:00
yflory 43c045721c Get the channel history 2017-04-14 18:36:36 +02:00
ansuz f6d6f81d55 send feedback when a user registers 2017-04-14 18:21:11 +02:00
ansuz eed5b1260d set font-size label to match other ckeditor font sizes 2017-04-14 18:20:40 +02:00
ansuz deeb47c40b reportAppUsage for settings 2017-04-14 18:19:04 +02:00
Pierre Bondoerffer 0db603f580
spanish pinpad 2017-04-14 17:59:08 +02:00
ansuz 84dd879abb add messages for settings page 2017-04-14 17:22:00 +02:00
ansuz 5a83759ee2 add usage button to settings page 2017-04-14 17:18:17 +02:00
ansuz a27cc76fc0 uppercase LOL 2017-04-14 15:35:02 +02:00
ansuz 402ce2db93 better validation of inputs 2017-04-14 15:34:22 +02:00
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
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 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