summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2012-12-07merged upstream developWikinaut
2012-12-06Merge pull request #1268 from ether/fix/eejs-block-cachingJohn McLear
2012-12-06Fix #1247, #1201: Don't cache eejs blocks!Marcel Klehr
2012-12-06Merge pull request #1267 from goldquest/fix-import-hangingJohn McLear
2012-12-06use the parent window, not the topgoldquest
2012-12-06Merge pull request #1265 from joker-x/developJohn McLear
2012-12-06reverse old changeIván Eixarch
2012-12-06avoid use of os.tmpDir() for node 0.6 compatibilityIván Eixarch
2012-12-06Merge remote branch 'ether/develop' into developIván Eixarch
2012-12-05Merge pull request #1264 from goldquest/developJohn McLear
2012-12-06fix for multiple cookies support (Also fix for, when session is not valid any...goldquest
2012-12-06Added semicolonsgoldquest
2012-12-05Merge pull request #1257 from marcelklehr/fix/api-if-requireAuthJohn McLear
2012-12-05Merge pull request #1259 from GuillaumeAmat/fixes/import-file-input-sizeMarcel Klehr
2012-12-05Reduces the width of the file input to prevent overflow in the import popupGuillaume AMAT
2012-12-05Fix #1226: Chrome would load async jsMarcel Klehr
2012-12-05Merge pull request #1255 from 0ip/feature/show-pl-versionMarcel Klehr
2012-12-05Fix #1219: Make api work if requireAuth is enabledMarcel Klehr
2012-12-05Adjust select width0ip
2012-12-04Add comment to explain how the property containing the version is being read0ip
2012-12-04Display plugin versions0ip
2012-12-04Merge pull request #1223 from joker-x/languages4translatewikiMarcel Klehr
2012-12-04added direction language in EnglishIván Eixarch
2012-12-04Update language4translatewiki 0.1.3Iván Eixarch
2012-12-04Merge remote branch 'ether/develop' into languages4translatewikiIván Eixarch
2012-12-03Merge pull request #1221 from ether/focus-on-passwordJohn McLear
2012-12-03best I can do with this temporary fix for IEJohn McLear
2012-12-03stop password being clearly visibleJohn McLear
2012-12-03fix IE auth but only a temp fixJohn McLear
2012-12-03Merge pull request #1248 from ether/improved-searchMarcel Klehr
2012-12-03make it show password dialog on wrong passwordJohn McLear
2012-12-03last JS fixJohn McLear
2012-12-03whoopsiJohn McLear
2012-12-03Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-passwordJohn McLear
2012-12-03Update strings, add UK strings, fix JSroot
2012-12-03improve search to use description too, bit more cpu heavy for thats okayJohn McLear
2012-12-02Merge pull request #1205 from joker-x/masterJohn McLear
2012-12-03fixed git merge confictIván Eixarch
2012-12-02remove ssl not enabled messageJohn McLear
2012-12-02console.debug socketTransportProtocolsWikinaut
2012-12-02removed empty line in settings.json.templateWikinaut
2012-12-02removed wrong comment in settings.json.templateWikinaut
2012-12-02removed wrong comment in Settings.jsWikinaut
2012-12-02add socketTransportProtocols parameterWikinaut
2012-12-02Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus...John McLear
2012-12-02Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-passwordJohn McLear
2012-12-02first effort to move into templates but javascript is broken so dont pullroot
2012-12-02Localisation updates from http://translatewiki.net.Siebrand Mazeland
2012-12-02Merge remote branch 'ether/develop' into developIván Eixarch
2012-12-01Localisation updates from http://translatewiki.net.Niklas Laxström
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:35:09 +0000