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

1112 commits

Author SHA1 Message Date
mluto
a239158b49 Renamed paramSettings to getParameters, to cause less confusion 2013-01-28 20:17:34 +01:00
John McLear
51eff0d659 change to createDiffHTML 2013-01-28 16:53:29 +00:00
John McLear
4378561882 change to createDiffHTML 2013-01-28 16:52:23 +00:00
mluto
f974136d0c Jump to revision given in URL, add current revision to URL 2013-01-28 10:13:37 +01:00
spcsser
80333d8e0a Added ability to add menu entries for admin pages. 2013-01-27 23:02:27 +01:00
Siebrand Mazeland
75b861e93b Localisation updates from http://translatewiki.net. 2013-01-27 19:41:00 +00:00
John McLear
3fac18f88a resolve merge conflict 2013-01-27 17:54:26 +00:00
John McLear
ed5644d4e5 docs 2013-01-27 17:51:40 +00:00
Peter 'Pita' Martischka
878fd7631c Fixed HTML export 2013-01-27 17:25:50 +00:00
Peter 'Pita' Martischka
07a267be7a Added colors to pad diff 2013-01-27 16:45:09 +00:00
Peter 'Pita' Martischka
dcfb1b2ea4 Added missing functions to create pad diffs 2013-01-27 15:40:37 +00:00
Peter 'Pita' Martischka
f4690dda9d fixed indent 2013-01-27 15:40:05 +00:00
mluto
7432b7aff9 Rewrote getParams() to be more dynamic and shorter 2013-01-27 11:02:15 +01:00
John McLear
e811037300 Merge pull request #1411 from ether/feature/plugin-update-checker 
plugin update checker
 2013-01-26 13:36:11 -08:00
Marcel Klehr
541aeb3a98 /admin/plugins: Display an update button for all plugins that are outdated 2013-01-26 22:15:19 +01:00
Marcel Klehr
0549a4fec7 Add checkUpdates endpoinnt for /admin/plugins 2013-01-26 22:13:28 +01:00
John McLear
1290fa36c3 typo fix 2013-01-26 20:05:37 +00:00
John McLear
9d0672c1c8 not a perfect css fix but stops the overflow when screen is less than 1000px 2013-01-26 20:04:33 +00:00
John McLear
090508909e Merge pull request #1389 from ether/disconnect-eejs-block 
add eejs block for disconnect
 2013-01-26 09:06:53 -08:00
John McLear
0ccd1a30e9 Merge pull request #1390 from ether/html-head-block-eejs 
add a html block eejs so you can add a cache manifest
 2013-01-26 09:06:38 -08:00
John McLear
51daaf02ce Merge pull request #1407 from mluto/hardcoded-i18n 
i10ze hardcoded message, update some messages on lang-change
 2013-01-26 07:19:04 -08:00
mluto
cb2b93b133 Added getChatHistory and getChatHead (api+code+doc) 2013-01-26 14:35:26 +01:00
mluto
046fac9fa9 Added a comment to clearify *why* this works 2013-01-25 20:38:24 +01:00
mluto
763864539f Use 'html10n' instead of '_', i10nzed "unnamed author(s)" 2013-01-25 17:41:33 +01:00
mluto
4a20a26cbf Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n 2013-01-25 17:14:56 +01:00
mluto
509f564cd7 re-formated onelined en.json 2013-01-25 17:06:57 +01:00
Marcel Klehr
2841bfc009 Merge branch 'feature/real-time-plugin-search' into develop 2013-01-25 14:50:51 +01:00
mluto
7812d93e74 Fixed "unnamed" and "enter your name" in userlist 2013-01-25 10:32:09 +01:00
John McLear
568b641ee9 Merge pull request #1404 from ether/feature/real-time-plugin-search 
real-time plugin search
 2013-01-24 14:09:30 -08:00
Marcel Klehr
3e793b8a63 [/admin/plugins] remove progress history 2013-01-24 23:00:56 +01:00
Marcel Klehr
23dd4c73e2 pluginfw/installer.js: Don't freak out users with cryptic errors, just use the error message 2013-01-24 22:40:31 +01:00
Marcel Klehr
fa55cd4759 [/admin/plugins] Add real-time on keypress search 
also, I reduced the size of the activity indicator
 2013-01-24 22:39:52 +01:00
John McLear
1f7140345a index wrapper block 2013-01-24 20:03:07 +00:00
John McLear
ccc06b08ee Merge pull request #1402 from marcelklehr/feature/uniform-admin-menu 
Add a unified menu to all admin pages
 2013-01-24 10:00:58 -08:00
Marcel Klehr
7c06dc750c Unify admin page titles 2013-01-24 18:46:32 +01:00
Marcel Klehr
2eccaa2afd Add a uniform menu to all admin pages 2013-01-24 18:46:15 +01:00
John McLear
569fb8d3c8 silly little bug now resolved 2013-01-24 16:48:40 +00:00
John McLear
18b96b33c6 Merge pull request #1379 from ether/more-plugin-details 
resolve #1349 - add url to plugin name
 2013-01-24 07:29:30 -08:00
Marcel Klehr
3719ce7c5d [admin] Make links prettier 2013-01-24 13:50:49 +01:00
Marcel Klehr
9fa5b9506e Add links for installed plugins 2013-01-24 13:43:42 +01:00
John McLear
28aa1ecc24 Merge pull request #1398 from marcelklehr/fix/html10n-ie8-array.indexOf 
Fix Array.prototype.indexOf for IE8! <3
 2013-01-23 08:49:15 -08:00
Marcel Klehr
25e1ed2d0c Fix Array.prototype.indexOf for IE8! <3 2013-01-23 17:40:10 +01:00
goldquest
74185e79ab use the existing padimpexp object from the parent window 2013-01-23 16:36:37 +01:00
John McLear
9129c6970a add a html block eejs so you can add a cache manifest 2013-01-23 02:46:57 +00:00
John McLear
b76f084f3a add eejs block for disconnect 2013-01-23 01:01:35 +00:00
John McLear
f1b9c213ee and semi working 2013-01-22 23:37:53 +00:00
John McLear
3fb2f02875 semi working 2013-01-22 23:16:49 +00:00
John McLear
d21585b880 mheh 2013-01-22 23:06:52 +00:00
John McLear
205d983225 make it crash 2013-01-22 22:48:05 +00:00
John McLear
5d416579ee bring in some padDiff stuff that doesnt suck 2013-01-22 22:33:51 +00:00
John McLear
6ae46ea8e3 fix issue where url was wrong for install 2013-01-22 18:28:38 +00:00
John McLear
159feceb20 fix import without params 2013-01-22 18:17:15 +00:00
John McLear
c6882aa65a Merge pull request #1386 from ether/fix-import-on-params 
fix issue #1369 where params would break import
 2013-01-22 08:05:04 -08:00
John McLear
e23108d199 fix issue #1369 where params would break import 2013-01-22 16:03:00 +00:00
goldquest
666c0adcd2 script tag didn't link to right location 2013-01-22 16:42:56 +01:00
Siebrand Mazeland
7869a543dd Localisation updates from http://translatewiki.net. 2013-01-22 06:14:31 +00:00
John McLear
441dd3785a fix issue #1110 2013-01-20 23:11:59 +00:00
John McLear
8bfa8a7e73 better urls 2013-01-20 22:42:32 +00:00
John McLear
4cbf3869c6 open in external window 2013-01-20 22:36:58 +00:00
John McLear
1bf526124d resolve #1349 2013-01-20 22:34:27 +00:00
John McLear
4b5d993f0d bump v and create CHANGELOG 2013-01-20 13:45:16 +00:00
John McLear
b282547dbf Merge pull request #1376 from t-8ch/patch-2 
listAllPads needs findKeys from ueberDB 0.1.9
 2013-01-20 05:42:44 -08:00
John McLear
0a06b07f7d Merge pull request #1377 from mluto/add-users-block 
Added a template block for #users
 2013-01-20 05:35:19 -08:00
mluto
9c364d7d38 Added a template block for #users 2013-01-20 13:56:51 +01:00
Thomas Weißschuh
9ee5098ad6 listAllPads needs findKeys from ueberDB 0.1.9 2013-01-19 19:17:52 +00:00
Jordan Hollinger
858d8e6e71 listAllPads should return an object, not an arraay. issue #1374 2013-01-18 11:13:03 -05:00
John McLear
96989e63c7 prepare for release 2013-01-18 13:30:46 +00:00
Marcel Klehr
a1188c15c0 [html10n] Fix onload event listener (must be attached to window!) 2013-01-16 19:47:54 +01:00
mluto
e31b9fd1bd IE8 does not have a string.trim()-function, so use regex.. 2013-01-16 18:48:25 +01:00
John McLear
5eb09f981b Merge pull request #1358 from mluto/clientvars-hook 
Make the creation of clientVars hookable
 2013-01-14 14:26:30 -08:00
John McLear
bb9097e528 Merge pull request #1355 from mluto/chat-no-empty-line 
prevent empty chat-messages from being sent
 2013-01-14 14:25:46 -08:00
mluto
27c5498c54 Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys 2013-01-14 23:22:12 +01:00
mluto
41cb5d8265 Added hook for clientVars and hook-doc 2013-01-14 22:51:26 +01:00
mluto
94f9b05c4c Only create clientVars when they are needed 2013-01-14 22:08:33 +01:00
Swen
96b7b5e8d0 Removed unnecessary return statement 2013-01-14 21:12:40 +01:00
John McLear
654654b4e1 Merge pull request #1342 from spcsser/feature/padlisting 
API & backend to list pads on epl instance
 2013-01-14 08:13:57 -08:00
mluto
77401f2759 prevent empty chat-messages from being sent 2013-01-14 17:11:56 +01:00
John McLear
1e7bcdba59 more sensible timeslider blocks.. 2013-01-14 03:42:09 +00:00
John McLear
33e0ec2097 Merge pull request #1334 from mluto/load-more-chat-messages 
Load more than 100 chat messages using a 'load more'-link
 2013-01-13 10:31:45 -08:00
John McLear
6104987a4b Merge pull request #1353 from ether/feature/log4js-config-setting 
Add log4js config setting
 2013-01-13 10:28:15 -08:00
John McLear
0bcfef5aa4 Merge pull request #1352 from ether/timeslider-eejs 
add a body eejs block to timeslider
 2013-01-13 10:27:50 -08:00
John McLear
eb0338d40c better shindig 2013-01-13 18:23:35 +00:00
Siebrand Mazeland
f8d6ffa22a Localisation updates from http://translatewiki.net. 2013-01-13 15:01:03 +00:00
Marcel Klehr
f4b95c5ca4 Add log4js config setting 2013-01-13 12:20:49 +01:00
John McLear
e137919c3d add a body eejs block to timeslider 2013-01-12 23:51:35 +00:00
0ip
2786807f2f Fix broken relative paths 
Bug introduced in 53521c8732
 2013-01-12 18:41:56 +01:00
spcsser
9687ecbb82 Modified pad list manager to return an ordered list. 2013-01-11 18:31:53 +01:00
Swen
e9726890a4 Edited getPads function to be able to work without callback 2013-01-11 04:43:59 +01:00
John McLear
730266256c fix #1341 by adding css to stop highlighting 2013-01-10 15:14:10 +00:00
Marcel Klehr
7a62661705 Merge pull request #1346 from ether/fix-timeslider-date-not-changing 
fix #1345: timeslider time delta
 2013-01-10 04:50:12 -08:00
John McLear
ac448937ab fix egils fix of time delta resolves #1345 2013-01-10 00:01:38 +00:00
Swen
c9f137b2e5 Added functionality to use spcsser/ueberDB findKey functionality. 2013-01-09 20:45:39 +01:00
Swen
7a49c82e16 Added comments 2013-01-08 20:21:14 +01:00
Swen
8c3263a6ea Added comments 2013-01-08 20:19:10 +01:00
Swen
198754222d Added functionality to list pads on this server. 2013-01-08 20:14:01 +01:00
John McLear
fadfa6772e changelog and package file 2013-01-07 19:31:29 +00:00
Marcel Klehr
e6d523ba1c Merge pull request #1317 from ether/enter-on-plugins 
/admin/plugins: stop enter reloading new page on search result request
 2013-01-07 10:46:05 -08:00
Oscar Perez
f00dddd09c Moved console existence check before the variable is used. This was causing a crash in Internet Explorer when the console was not enabled (console is off by default). 2013-01-07 13:24:40 -05:00
mluto
bc05f9eb0a converted load-more-link to button, added loading-gif, fixed typo 2013-01-07 19:15:55 +01:00
mluto
825b258d99 only load 20 messages when pressing the load-link, fixed whitespace 2013-01-07 17:43:03 +01:00
mluto
5f81daed0a Added link to load more chat-messages using new GET_CHAT_MESSAGES 2013-01-07 17:36:03 +01:00
John McLear
8e366da82e use .val() instead of [0] 2013-01-07 11:27:40 +00:00
Siebrand Mazeland
1782c68d4d Localisation updates from http://translatewiki.net. 2013-01-07 10:18:02 +00:00
John McLear
44981e8907 Merge pull request #1331 from mluto/fix-locales 
Fixed broken placeholders in locales
 2013-01-06 12:03:34 -08:00
mluto
c57ecf06ca fixed broken placeholders in locales 2013-01-06 18:50:52 +01:00
mluto
5592c4b0fe client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages 2013-01-06 16:11:48 +01:00
mluto
9484b92ae2 fixed and unified indenting, added comments in handleClientReady 2013-01-06 14:55:33 +01:00
mluto
77315aa1d4 Load CSS before JS, in timeslider 2013-01-06 12:26:00 +01:00
mluto
c56c7b8ca9 Load CSS before JS 
According to google this is more efficent
https://developers.google.com/speed/docs/best-practices/rtt?hl=en#PutSty
lesBeforeScripts
 2013-01-06 12:19:56 +01:00
Stephan Jauernick
9f9f7a627e corrected a documentation glitch for checkToken - clarified which token is validated 2013-01-02 15:14:46 +01:00
John McLear
c370f779cc stop enter reloading new page on search result request 2013-01-02 14:01:39 +00:00
Marcel Klehr
53459fe160 release v1.2.3 2012-12-31 15:57:16 +01:00
Marcel Klehr
b6c9b4ec30 Fix #1309 : Fix support for node v0.6 2012-12-31 15:47:42 +01:00
John McLear
d9ef9f5648 Merge pull request #1308 from marcelklehr/fix/console-log-html10n-chrome 
Fix #1307: Chrome needs console.log to be called on console obj
 2012-12-30 06:50:21 -08:00
Siebrand Mazeland
f894d9b8f4 Localisation updates from http://translatewiki.net. 2012-12-30 10:31:57 +00:00
Marcel Klehr
ba6e0d2a05 Fix #1307: Chrome needs console.log to be called on console obj 2012-12-30 10:56:31 +01:00
Marcel Klehr
ffc9bcf028 Bump API version for checkToken endpoint 2012-12-27 22:09:22 +01:00
John McLear
b681359dfa bump version # in package and update CHANGELOG 2012-12-27 20:09:14 +00:00
Marcel Klehr
369e24682b Merge pull request #1297 from marcelklehr/migrate-to-html10n 
Migrate to html10n and allow plugin l10n
 2012-12-27 07:56:41 -08:00
John McLear
746396951d Resolve #1301 startup pointing at old bitly URL 2012-12-26 00:17:43 +00:00
Marcel Klehr
220e084484 Simplify local locale file format 2012-12-23 22:43:32 +01:00
Marcel Klehr
d84951cd04 Remove locale file converter (ini2json) 2012-12-23 18:31:59 +01:00
Marcel Klehr
2055a2b176 [l10n] Convert all ini files to json 2012-12-23 18:23:56 +01:00
Marcel Klehr
fefbdb6fe1 Add direction info 2012-12-23 18:17:25 +01:00
Marcel Klehr
fdf6628cc5 Fix html attr translation 2012-12-23 18:17:23 +01:00
Marcel Klehr
04b65a0b4e Add support for three-letter lang codes 2012-12-23 18:17:21 +01:00
Marcel Klehr
0c9178d392 Fix html10n usage in code that wouldn't allow lang switching 2012-12-23 18:17:19 +01:00
Marcel Klehr
580d936e50 Fix lang pre-selection of lang picker 
(would break in cases when html10n might not have loaded yet)
 2012-12-23 18:17:17 +01:00
Marcel Klehr
23b7469df6 [html10n] Don't expose lang code, if the language is not available 2012-12-23 18:17:14 +01:00
Marcel Klehr
7aba02f0cf Don't break if a plugin hasn't got a locales dir 2012-12-23 18:17:12 +01:00
Marcel Klehr
cf24e53eae Simplify server-side i18n code and make it a bit more understandable 2012-12-23 18:17:10 +01:00
Marcel Klehr
4a489f85f6 Fix translations in timeslider template 2012-12-23 18:17:08 +01:00
Marcel Klehr
f68adc8553 Fix translations in timeslider code 2012-12-23 18:17:05 +01:00
Marcel Klehr
e34036513e There's no utf8, but there's utf-8 2012-12-23 18:17:03 +01:00
Marcel Klehr
3c3c1630b1 Revert "Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!" 
This reverts commit 5fb7a03fb34078a75fe5932563e5a9fe44c57015.
 2012-12-23 18:17:01 +01:00
Marcel Klehr
00d7ebc646 Allow html10n to handle import paths relative to the importing file 2012-12-23 18:16:59 +01:00
Iván Eixarch
9d459687af fixed bug in parseIni 2012-12-23 18:16:56 +01:00
Iván Eixarch
bc0d9c854b use relativa path in import definitions of locales.json 2012-12-23 18:16:54 +01:00
Marcel Klehr
d9d0312a9e Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it! 
(As if we wouldn't look forward to that...)
 2012-12-23 18:16:52 +01:00
Marcel Klehr
51f6ac6b71 Fix lang picker, again 2012-12-23 18:16:50 +01:00
Marcel Klehr
a2b2257851 Fix html10n cache and lang fallback 2012-12-23 18:16:48 +01:00
Marcel Klehr
e3f9ed37b4 Hacky solution for exploreDir error 
We should only traverse the directories of actual plugins instead
of traversing the whole node_modules folder
 2012-12-23 18:16:45 +01:00
Marcel Klehr
f4f2c1d9ab Fix lang picker 2012-12-23 18:16:43 +01:00
Marcel Klehr
64b176f4de Fix html10n (finally) 2012-12-23 18:16:41 +01:00
Marcel Klehr
67c893aaca Fix html10n and the locale resource <link>s 2012-12-23 18:16:39 +01:00
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
Siebrand Mazeland
f0b613aa57 Localisation updates from http://translatewiki.net. 2012-12-21 18:45:56 +00: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
a5965bcdb5 Merge pull request #1244 from Wikinaut/add-socketio-transport-protocol-parameter 
add socketTransportProtocols parameter
 2012-12-10 15:15:05 -08: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
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
Wikinaut
5a4c8e2a4a Merge remote-tracking branch 'upstream/develop' into add-socketio-transport-protocol-parameter 2012-12-08 03:04:48 +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
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
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
goldquest
1380fda2b2 use the parent window, not the top 2012-12-06 17:51:43 +01: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
goldquest
7631096135 fix for multiple cookies support (Also fix for, when session is not valid anymore) 2012-12-06 02:01:38 +01:00
goldquest
4ce16b526e Added semicolons 2012-12-06 02:00:58 +01:00
John McLear
6b3917cde7 Merge pull request #1257 from marcelklehr/fix/api-if-requireAuth 
Fix #1219: Make api work if requireAuth is enabled
 2012-12-05 07:27:59 -08:00
Marcel Klehr
b5af643969 Merge pull request #1259 from GuillaumeAmat/fixes/import-file-input-size 
Reduce the file input's width in the import popup to prevent overflow
 2012-12-05 06:14:05 -08:00
Guillaume AMAT
c853f8fad2 Reduces the width of the file input to prevent overflow in the import popup 2012-12-05 15:02:32 +01:00
Marcel Klehr
fe89a367cc Fix #1226: Chrome would load async js 2012-12-05 14:16:44 +01:00
Marcel Klehr
2f37afac66 Merge pull request #1255 from 0ip/feature/show-pl-version 
Display plugin version numbers in /admin/plugins
 2012-12-05 05:09:20 -08:00
Marcel Klehr
377ff1eade Fix #1219: Make api work if requireAuth is enabled 2012-12-05 14:04:48 +01:00
0ip
8d0ef88baf Adjust select width 
looks better :)
 2012-12-05 12:55:48 +01:00
0ip
20f13bc8ce Add comment to explain how the property containing the version is being read 2012-12-04 19:08:25 +01:00
0ip
1fc5519c86 Display plugin versions 2012-12-04 14:30:30 +01:00
Iván Eixarch
a2b22652ce added direction language in English 2012-12-04 13:02:23 +01:00
Iván Eixarch
5f949b8457 Update language4translatewiki 0.1.3 2012-12-04 12:12:58 +01:00
Iván Eixarch
b21c4403b2 Merge remote branch 'ether/develop' into languages4translatewiki 2012-12-04 11:40:17 +01:00
John McLear
55d543f9ca Merge pull request #1221 from ether/focus-on-password 
proper fix for focus and some styling of the form and allows for pressin...
 2012-12-03 06:35:16 -08:00
John McLear
1e8d954560 best I can do with this temporary fix for IE 2012-12-03 14:28:25 +00:00
John McLear
b3e55f64a8 stop password being clearly visible 2012-12-03 13:10:32 +00:00
John McLear
0b92fdfc62 fix IE auth but only a temp fix 2012-12-03 12:47:11 +00:00
Marcel Klehr
17fb60e483 Merge pull request #1248 from ether/improved-search 
Improve plugin search

uses modules descriptions too now, bit more cpu heavy, but that's okay
 2012-12-03 04:14:15 -08:00
John McLear
d09894ce77 make it show password dialog on wrong password 2012-12-03 12:05:11 +00:00
John McLear
4843840d72 last JS fix 2012-12-03 11:44:30 +00:00
John McLear
b0463bd7d5 whoopsi 2012-12-03 11:41:51 +00:00
John McLear
bef25b40f8 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-03 11:37:01 +00:00
root
84d154b168 Update strings, add UK strings, fix JS 2012-12-03 11:35:06 +00:00
Simon Leblanc
38b14c40f0 Add same color in pad and chat for author 2012-12-03 03:43:56 +01:00
John McLear
b5c263dd37 improve search to use description too, bit more cpu heavy for thats okay 2012-12-03 01:41:01 +00:00
Iván Eixarch
657322db91 fixed git merge confict 2012-12-03 01:39:59 +01:00
John McLear
8a9045b335 remove ssl not enabled message 2012-12-02 18:33:31 +00:00
Wikinaut
0d2eddb62a console.debug socketTransportProtocols 2012-12-02 18:54:30 +01:00
Wikinaut
9224e9beef removed wrong comment in Settings.js 2012-12-02 18:44:39 +01:00
Wikinaut
8b044254cc add socketTransportProtocols parameter 2012-12-02 18:28:28 +01:00
John McLear
a74defdab7 Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:07:23 +00:00
John McLear
c9a5e55654 Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password 2012-12-02 17:06:33 +00:00
root
3cdf66c2f7 first effort to move into templates but javascript is broken so dont pull 2012-12-02 17:03:56 +00:00
Siebrand Mazeland
e9e4d65ad4 Localisation updates from http://translatewiki.net. 2012-12-02 12:35:02 +00:00
Iván Eixarch
b0b64358f9 Merge remote branch 'ether/develop' into develop 2012-12-02 05:57:14 +01:00
Niklas Laxström
d4b79a6cba Localisation updates from http://translatewiki.net. 2012-12-01 11:32:26 +00:00
John McLear
3dcbd8dd4e fix the control S to save a revision 2012-11-30 23:28:34 +00:00
John McLear
a4c4d11cd4 fix letter s... 2012-11-30 15:26:51 -08:00
John McLear
d761003588 fix path to favicon resolves #1236 2012-11-30 22:50:54 +00:00
Marcel Klehr
ab148ebc1a Merge pull request #1229 from ether/control-s 
catch control S and send an event to save a revision -- fixes #1128
 2012-11-29 08:57:10 -08:00
John McLear
53d6d0813e Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers 
Let socket.io decide which transport is best for the browser
 2012-11-29 06:55:51 -08:00
Marcel Klehr
719fb7e045 Let socket.io decide which transport is best for the browser 2012-11-29 13:42:37 +01:00
Iván Eixarch
795a20b3f2 get languages availables through translatewiki API 2012-11-28 23:54:23 +01:00
John McLear
93e9d7c852 remove control S comment 2012-11-28 17:20:58 +00:00
John McLear
8c7939ec9f catch control S and send an event to save a revision 2012-11-28 17:17:35 +00:00
Iván Eixarch
9ec8a6e3d3 back to globalize... don't work :S 2012-11-28 04:02:55 +01:00
Iván Eixarch
1cc0e8cbf0 Restore original ini file 2012-11-28 03:27:09 +01:00
Iván Eixarch
523c7aebe5 Merge remote branch 'ether/develop' into develop 2012-11-28 03:13:04 +01:00
John McLear
c445197e7f Update src/static/css/pad.css 2012-11-27 15:10:36 +00:00
Iván Eixarch
97d77ea089 added my name in header 2012-11-27 00:11:45 +01:00
Iván Eixarch
6fe6103632 added languages for translatewiki 2012-11-26 23:40:31 +01:00
Iván Eixarch
7280376a26 Merge with ether develop 2012-11-26 22:11:31 +01:00
John McLear
f880473360 remember the styling for the pasword prompt 2012-11-26 20:54:28 +00:00
John McLear
fddca354b3 proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix 2012-11-26 20:52:10 +00:00
John McLear
b66c9135f7 Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap 2012-11-26 20:20:21 +00:00
John McLear
6239c66e36 remove alert on line wrap as it doesnt mean anything 2012-11-26 20:19:27 +00:00
John McLear
491bf515c6 Merge pull request #1199 from leblanc-simon/develop 
improving the translation of the timeline
 2012-11-26 11:48:08 -08:00
Wikinaut
a49bab5dae fix timeslider rightstep button position 2012-11-26 08:54:13 +01:00
Iván Eixarch
d7cca602df Added message translatable about features importing without abiword 2012-11-26 03:18:47 +01:00
Iván Eixarch
460200981e Merge remote branch 'ether/develop' 2012-11-26 02:21:18 +01:00
Niklas Laxström
de5a90b9c7 Localisation updates from http://translatewiki.net. 2012-11-25 12:52:08 +00:00
John McLear
fdf0b1a384 Merge pull request #1202 from Wikinaut/fix-1148-add-native-node-https-support 
Fix 1148 add native node https support
 2012-11-24 16:35:02 -08:00
Iván Eixarch
6d5907562d Fixed installed plugins section in plugins/info 2012-11-24 03:18:22 +01:00
Iván Eixarch
8ac49477f9 Fix 1203: non-escaped html in plugins info 2012-11-24 00:42:44 +01:00
Iván Eixarch
ef7590fb73 Fix 1203: non-escaped html in plugins info 2012-11-24 00:26:48 +01:00
Iván Eixarch
0250f8d55c Merge remote branch 'ether/develop' 2012-11-23 22:57:05 +01:00
Iván Eixarch
cc60b82a6e Import html by default and allow basic import/export features without abiword 2012-11-23 22:55:25 +01:00
Iván Eixarch
ef3231efd2 cleaning 2012-11-23 19:06:18 +01:00
Iván Eixarch
d0a17d5471 test import converting to html instead to txt by default 2012-11-23 18:18:03 +01:00
Simon Leblanc
94e9cf0a32 improving the translation of the timeline 2012-11-23 06:20:09 +01:00