public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,650 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

2650 Commits (ea04e9c997cdd219eff2147a468301ccfb16085c)

Author SHA1 Message Date
John McLear 344e8be328 Merge branch 'master' of github.com:ether/etherpad-lite 2013-01-07 19:41:59 +00:00
Marcel Klehr 1f37475ae8 Merge pull request #1337 from ether/release/releases-1.2.4 
Release/releases 1.2.4
 2013-01-07 11:39:54 -08:00
John McLear 66db8392c5 Merge branch 'release/releases-1.2.4' 2013-01-07 19:39:16 +00: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
Marcel Klehr 2a142a01e9 Merge pull request #1332 from ether/dont-run-timeslider-test 
disable timeslider test for now
 2013-01-07 10:44:30 -08:00
Marcel Klehr 5453764e31 Merge pull request #1336 from poscar/ie_console_fix 
Fixed IE crash related to console usage. (Fix #1321)
 2013-01-07 10:43:48 -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 042c1c0c98 Merge pull request #1333 from mluto/fix-readme-link 
fixed 'client implementations'-link in README.md
 2013-01-07 08:21:15 -08:00
mluto a65c7e1b6a fixed 'client implementations'-link in README.md 2013-01-07 16:25:43 +01:00
John McLear 7a2f16f288 dont run timeslider test for now 2013-01-07 11:49:04 +00: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
John McLear 1e723d02b1 Merge pull request #1330 from mluto/fix-extractPadData 
Fixed extractPadData.js, #1320
 2013-01-06 12:02:39 -08:00
mluto e7d9359737 Added error-handling for npm 2013-01-06 20:20:46 +01:00
mluto 7ec7ccc402 Fixed extractPadData.js, #1320 2013-01-06 19:25:32 +01:00
mluto c57ecf06ca fixed broken placeholders in locales 2013-01-06 18:50:52 +01:00
Marcel Klehr 2a89dc5913 Merge pull request #1327 from mluto/order-styles-script 
Optimize the order of styles and scripts
 2013-01-06 09:46:57 -08: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 6a27a54727 Added --root argument to run.sh to bypass the root-check, fix for #1324 2013-01-06 12:48:32 +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
John McLear 6e7b694243 Merge pull request #1318 from stephan48/develop 
Corrected Documentation for checkToken() API Method
 2013-01-02 06:20:59 -08: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 1d5dbd45ca Merge branch 'master' into develop 2012-12-31 16:33:01 +01:00
John McLear a42f220ee2 Merge pull request #1311 from ether/release/releases-1.2.3 
Release 1.2.3
 2012-12-31 07:16:01 -08: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 b31563ea07 Fix docs: Correct API version for listAllGroups endpoint 2012-12-28 15:37:10 +01:00
Marcel Klehr 187ee21b8e Merge pull request #1305 from ether/master 
Updating develop with 1.2.2 release
 2012-12-27 13:18:25 -08:00
Marcel Klehr 6a65a47444 Merge pull request #1304 from ether/release/releases-1.2.2 
Version 1.2.2 release
 2012-12-27 13:16:28 -08: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 e60f8de676 Expand plugin system docs with l10n info 2012-12-23 22:48:28 +01: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 1a4923ef60 Update docs 2012-12-23 18:17:30 +01:00
Marcel Klehr f830602cb2 Add rtl frontend test 2012-12-23 18:17:27 +01:00