libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2428 commits 2 branches 0 tags 24 MiB
Commit graph

2428 commits

This branch
This branch
All branches
Author SHA1 Message Date
Iván Eixarch
2b860986e8 support for json in i18n 2012-12-23 18:16:37 +01:00
Iván Eixarch
1f4a171f10 convert language files from ini to json 2012-12-23 18:16:35 +01:00
Marcel Klehr
6446281254 Migrate lang picker and embed param to html10n.js 2012-12-23 18:16:32 +01:00
Iván Eixarch
754467782f convert language files from ini to json 2012-12-23 18:16:22 +01:00
Iván Eixarch
f72ec3eb28 convert language files from ini to json 2012-12-23 18:16:19 +01:00
Marcel Klehr
25be9b8c93 Add kick-off code for client-side l10n 2012-12-23 18:16:17 +01:00
Marcel Klehr
edacb3e2ca Update html10n.js 2012-12-23 18:16:15 +01:00
Marcel Klehr
53521c8732 Replace webL10n with html10n.js 2012-12-23 18:16:13 +01:00
Marcel Klehr
4534d20c80 Merge pull request #1292 from ilyash/ffed5fdb6ab1b792fbafb1c6d78f97b19f9e8324 
Updated project homepage in package.json
 2012-12-22 03:35:37 -08:00
Siebrand Mazeland
f0b613aa57 Localisation updates from http://translatewiki.net. 2012-12-21 18:45:56 +00:00
Ilya Sher
ffed5fdb6a Updated project home page in package.json 2012-12-18 12:47:06 +02:00
Siebrand Mazeland
fd848c30fd Localisation updates from http://translatewiki.net. 2012-12-16 22:01:37 +00:00
Siebrand Mazeland
48b1eb1aa9 Localisation updates from http://translatewiki.net. 2012-12-16 19:17:25 +00:00
John McLear
22501f8b5b Merge pull request #1282 from marcelklehr/docs/fix/translate-on-twn-pls 
[docs] Tell users to translate on twn
 2012-12-12 05:51:40 -08:00
Marcel Klehr
6cd7b999b5 [docs] Update localization.md and tell users to translate on twn 2012-12-12 12:00:33 +01:00
John McLear
a5965bcdb5 Merge pull request #1244 from Wikinaut/add-socketio-transport-protocol-parameter 
add socketTransportProtocols parameter
 2012-12-10 15:15:05 -08:00
Wikinaut
e1a1540011 moved to settings.json.template bottom; chg gitignore 2012-12-10 23:46:54 +01:00
Wikinaut
05e8c74307 removed console.log of transport protocols 2012-12-10 22:33:00 +01:00
John McLear
bf5283fa11 Fix issue #725 which was caused by a race condition 2012-12-10 11:34:53 +00:00
John McLear
f1ca9bb456 Merge pull request #1272 from stephan48/patch-1 
Added a checkToken Method for checking the Validity of the API Token
 2012-12-10 01:17:11 -08:00
Marcel Klehr
d1870e741f Merge pull request #1274 from joker-x/jstranslate 
Add missing strings to be translatable
 2012-12-09 12:53:10 -08:00
Iván Eixarch
ff8b4b6b20 change key of message sucessfull on import 2012-12-09 17:34:32 +01:00
Iván Eixarch
0371d5ba9e Remove async load of l10n.js because Chrome fail to translate 2012-12-09 09:41:30 +01:00
Iván Eixarch
9f1872afc1 use properties notation 2012-12-09 08:56:58 +01:00
Iván Eixarch
854ed56037 Merge remote branch 'ether/develop' into jstranslate 2012-12-09 08:43:19 +01:00
Siebrand Mazeland
25125c30c3 Localisation updates from http://translatewiki.net. 2012-12-08 18:47:42 +00:00
John McLear
5055852635 Merge pull request #1227 from ether/tests/add-timeslider-revisions-test 
Add a timeslider test
 2012-12-08 06:46:14 -08:00
Wikinaut
5a4c8e2a4a Merge remote-tracking branch 'upstream/develop' into add-socketio-transport-protocol-parameter 2012-12-08 03:04:48 +01:00
Marcel Klehr
80ce0b5edb Refine timeslider test 2012-12-07 16:20:23 +01:00
Marcel Klehr
48d0d12f65 Merge branch 'master' into develop 
Conflicts:
	README.md
 2012-12-07 15:21:58 +01:00
Marcel Klehr
45b1e3eacb Merge pull request #1249 from leblanc-simon/develop 
Fix author colors in chat
 2012-12-07 05:59:28 -08:00
Stephan Jauernick
c2cc292324 Update doc/api/http_api.md 
Added docs for the checkToken function
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
4318d210ce Update src/node/db/API.js 
Corrected function documentation.
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
26ece95905 Update src/node/db/API.js 
Added a missing symicolon and removed the padID argument which is not passed(and thus leads to an errors because the callback lands in there).
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
2163c8be5c Update src/node/handler/APIHandler.js 
Added the checkToken function to the function array.
 2012-12-07 11:28:03 +01:00
Stephan Jauernick
8686da87e8 Update src/node/db/API.js 
Added a checkToken method for checking if the API token is valid.
 2012-12-07 11:28:03 +01:00
John McLear
7427f9ba15 Update CONTRIBUTING.md 2012-12-07 11:27:58 +01:00
John McLear
019d2e01be Update CONTRIBUTING.md 2012-12-07 11:27:58 +01:00
John McLear
b6bf0ab936 Update CONTRIBUTING.md 2012-12-07 11:27:58 +01:00
Wikinaut
5bf79971b8 merged upstream develop 2012-12-07 08:59:13 +01:00
Iván Eixarch
b01903202c Added new strings to translate for js files 2012-12-07 05:24:40 +01:00
John McLear
98e03c1d87 Merge pull request #1268 from ether/fix/eejs-block-caching 
Fix #1247, #1201: Don't cache eejs blocks!
 2012-12-06 12:13:39 -08:00
Marcel Klehr
c909ed256f Fix #1247, #1201: Don't cache eejs blocks! 
Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
 2012-12-06 18:35:35 +01:00
John McLear
7933db4bc6 Merge pull request #1267 from goldquest/fix-import-hanging 
Fix import state hanging. Issue #976 & #1105
 2012-12-06 09:00:46 -08:00
goldquest
1380fda2b2 use the parent window, not the top 2012-12-06 17:51:43 +01:00
John McLear
0908caaf0d Merge pull request #1265 from joker-x/develop 
Avoid use of os.tmpDir() for keep node 0.6 compatibility
 2012-12-06 04:34:08 -08:00
Iván Eixarch
1a5035ae6b reverse old change 2012-12-06 11:53:58 +01:00
Iván Eixarch
bf04a4686a avoid use of os.tmpDir() for node 0.6 compatibility 2012-12-06 11:49:04 +01:00
Iván Eixarch
f9b6d9f122 Merge remote branch 'ether/develop' into develop 2012-12-06 11:22:05 +01:00
John McLear
deb2c54487 Merge pull request #1264 from goldquest/develop 
fix for multiple cookies support (Also fix for, when session is not valid anymore)
 2012-12-05 18:12:07 -08:00