Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 933831a2a8 add a comment about _languageName 2016-11-04 14:11:00 +01:00
ansuz 439a9981cc add documentation for submitting a translation 2016-11-04 14:10:32 +01:00
ansuz 72f284bb53 add comments so translators don't get completely lost 2016-11-04 11:51:52 +01:00
ansuz fda0f7d2e7 let javascript add language keys intead of html 2016-11-04 11:49:43 +01:00
ansuz 7b63decfee eliminate one step from the translation process by auto-adding languages to selector 2016-11-04 11:46:59 +01:00
ansuz 779b3914f9 fix spanish pluralization and update howitworks 2016-11-04 10:32:20 +01:00
ansuz e52450fdc7 update english and french translations to include link to bitcoin.pdf 2016-11-04 10:31:35 +01:00
ansuz f1bb63f915 translate missing keys to spanish using google translate 2016-11-03 16:05:37 +01:00
ansuz 8064b1d196 merge changes from soon 2016-11-03 16:05:02 +01:00
ansuz 2d5448458b export messages 2016-11-03 12:45:11 +01:00
ansuz b1370c05b7 add translation completeness test to assertion page 2016-11-03 12:44:12 +01:00
ansuz 54615932f8 merge in some espanol commits 2016-11-03 12:41:40 +01:00
ansuz 5f6ebb5cc1 fix incorrect regex for c-like title detection 2016-11-03 11:30:46 +01:00
ansuz d512b113cd address failure to parse url when hash is not present 2016-11-02 18:28:19 +01:00
ansuz 6ae851ffdd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon 2016-11-02 13:01:40 +01:00
ansuz 0b7ed69ec5 Merge branch 'staging' into staging-soon 2016-11-02 12:10:05 +01:00
ansuz 636b0fcadc do our best to keep the console quiet 2016-11-02 12:09:41 +01:00
ansuz 0a9d34a6c9 hide appended color pickers 2016-10-24 15:30:23 +02:00
ansuz 5dbd16a956 hide appended color pickers 2016-10-24 15:29:46 +02:00
ansuz c858b247c1 filter absent users from the userlist 2016-10-24 15:11:19 +02:00
ansuz ac3ddbab70 expose userList for later usage 2016-10-24 15:10:49 +02:00
ansuz a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging 2016-10-24 14:54:35 +02:00
ansuz 901a708be6 Merge branch 'usability1' of github.com:xwiki-labs/cryptpad into staging 2016-10-24 14:54:06 +02:00
ansuz 2326526f95 correct grammatical error in French translation 2016-10-24 14:32:34 +02:00
ansuz ef17dd66fa userButtonTitle to french translation. Thanks @yflory 2016-10-24 12:01:31 +02:00
ansuz 841ded8fdc add translation completeness test to assertion page 2016-10-24 11:51:16 +02:00
ansuz e07cb984e5 return, don't log 2016-10-24 11:47:13 +02:00
ansuz 1785516f0e add spanish translations to map. export a function which checks completion of translations 2016-10-24 11:41:36 +02:00
ansuz 02c0790dd6 export messages 2016-10-24 11:39:28 +02:00
ansuz 7285e655c3 fix unterminated strings 2016-10-24 11:23:27 +02:00
ansuz a846463328 change localization key back to france 2016-10-24 11:18:34 +02:00
ansuz 8347ab8bc6 Merge branch 'master' of github.com:heticor915/cryptpad into espanol 2016-10-24 10:37:51 +02:00
ansuz e23ac85b6d use absolute path to css 2016-10-20 11:30:36 +02:00
ansuz 78f8286fe3 add a note about installing storage adaptors from npm 2016-10-20 11:29:26 +02:00
ansuz 46c5f64369 remove absent users from the userlist 2016-10-19 12:30:25 +02:00
ansuz 2f9283a677 fix leaky global variable 2016-10-18 11:51:35 +02:00
ansuz a2e5c96115 make http headers configurable, update default conf 2016-10-18 11:48:29 +02:00
ansuz 0fe62f8c75 make wss CSP headers configurable again 2016-10-12 13:03:36 +02:00
ansuz 40bac1df55 Merge branch 'sandbox-frame' of https://github.com/cjdelisle/cryptpad into csp 2016-10-12 11:55:51 +02:00
ansuz 1f2e45d6c8 improved fs storage adaptor and config docs
* regularly close open file descriptors older than channelExpirationMs
* clean up older file descriptors when exceeding openFileLimit
2016-10-12 10:52:27 +02:00
ansuz 22464af6a5 fix reference to incorrect config flag 2016-10-12 10:39:46 +02:00
ansuz bb2317d8e6 fix chrome style bug by forcing reload of style sheet 2016-10-07 17:41:52 +02:00
ansuz 7d5a33512a enable slide application listing on home page by default 2016-10-04 17:15:09 +02:00
ansuz a28daf2715 use websocket url configuration api 2016-10-04 17:13:15 +02:00
ansuz dbc8f01b8b fix merge errors and reach full jshint compliance 2016-10-04 16:58:10 +02:00
ansuz 2ac1b02572 Merge branch 'config-sockets' into soon 2016-10-04 14:38:50 +02:00
ansuz 61dfca33a3 resolve conflict and merge 'newserver' 2016-10-04 12:43:14 +02:00
ansuz ee88e96baf merge noscript 2016-10-04 11:42:06 +02:00
ansuz 11f63c861c Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title 2016-10-04 11:23:04 +02:00
ansuz e1512a4063 Merge branch 'safe-sockets' into soon 2016-10-04 10:59:09 +02:00
ansuz 5e76194262 use new config api 2016-10-03 19:28:36 +02:00
ansuz 0ece2cf6a1 add to default configuration and comment 2016-10-03 19:28:14 +02:00
ansuz 3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
ansuz 9fa7da60b9 confirm that a socket is ready to send before sending 2016-10-03 15:38:42 +02:00
ansuz 4b238de84c quieter stdout and stderr logs 2016-09-30 15:51:23 +02:00
ansuz 921ee128bc deobfuscate email 2016-09-29 14:46:32 +02:00
ansuz 0be8c333e0 Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome 2016-09-28 09:01:33 +02:00
ansuz a266f0bee1 query parameter for messages 2016-09-27 11:01:32 +02:00
ansuz 4f5a5251d6 add note about nvm in readme 2016-09-26 16:14:45 +02:00
ansuz 6315915b5d Merge branch 'newhashNoConflict' into merge-hash 2016-09-26 13:55:10 +02:00
ansuz d6525087c7 jshint compliancy 2016-09-23 17:53:24 +02:00
ansuz ed9acf1c00 Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName 2016-09-23 16:40:07 +02:00
ansuz a4843cb5d7 Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict 2016-09-23 16:07:46 +02:00
ansuz a82b7aaf8b allow empty names 2016-09-23 16:06:46 +02:00
ansuz f6372ee803 add noreferrer attr to blank links as well 2016-09-21 15:02:08 +02:00
ansuz c50a0ac579 where target=blank, rel=noopener 2016-09-21 14:49:47 +02:00
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 259896a373 fix translation fragment in English messages file 2016-09-20 16:21:40 +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
ansuz 138d7e0a25 Merge branch 'translations' 2016-09-16 21:55:01 +02:00
ansuz 63bc7e121f remove unnecessary semicolon 2016-09-15 18:57:07 +02:00
ansuz 498b24d389 Merge branch 'translations' of github.com:xwiki-labs/cryptpad 2016-09-15 18:36:35 +02:00
ansuz 1f4d0888ad fix false positive for error handler 2016-09-15 14:57:20 +02:00
ansuz 4001e756cb add import script so admins can migrate lvl to files 2016-09-15 12:15:27 +02:00
ansuz c9ff6a519b Merge branch 'defaultTitle' 2016-09-15 10:18:12 +02:00
ansuz fc7576fe20 implement channel removal 2016-09-15 10:07:31 +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
ansuz d73fef7fe5 slightly better spacing 2016-09-14 16:00:06 +02:00
ansuz 0296989515 rewrite default config file 2016-09-14 15:53:41 +02:00
ansuz 38d1a1a291 faster message iteration 2016-09-14 15:06:35 +02:00
ansuz b46f74cd78 remove alternative storage adaptors from core 2016-09-14 12:33:06 +02:00
ansuz 349b6799e0 remove leveldb dependency 2016-09-14 11:21:59 +02:00
ansuz 19caac232b don't try to send invalid messages 2016-09-14 11:11:00 +02:00
ansuz 4b64f00cc0 don't log when cleaning up idle channels 2016-09-13 12:12:02 +02:00
ansuz be69e2828c implement flat file storage 2016-09-13 11:56:17 +02:00
ansuz 217e664d4c boilerplate for filesystem-backed storage 2016-09-12 16:40:23 +02:00
ansuz 68b35ace38 add a SQL database adaptor 2016-09-12 10:30:31 +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