summaryrefslogtreecommitdiff
path: root/src/static
AgeCommit message (Expand)Author
2012-11-26remove alert on line wrap as it doesnt mean anythingJohn McLear
2012-11-26Merge pull request #1199 from leblanc-simon/developJohn McLear
2012-11-26fix timeslider rightstep button positionWikinaut
2012-11-26Added message translatable about features importing without abiwordIván Eixarch
2012-11-23Merge remote branch 'ether/develop'Iván Eixarch
2012-11-23Import html by default and allow basic import/export features without abiwordIván Eixarch
2012-11-23improving the translation of the timelineSimon Leblanc
2012-11-21Merge pull request #1197 from hcartiaux/urlfixJohn McLear
2012-11-22Fix urls, use github.com/etherHyacinthe Cartiaux
2012-11-21Update src/static/js/pad.jsMike Brousseau
2012-11-21Merge pull request #1188 from joker-x/masterJohn McLear
2012-11-21Fix #1186 Autodetection wouldn't work correctly in IE9Marcel Klehr
2012-11-21Merge remote branch 'ether/develop'Iván Eixarch
2012-11-21Allow ! in urls autodetectionIván Eixarch
2012-11-20Use ; as comments indicator in i18n filesMarcel Klehr
2012-11-14Tidy up settings0ip
2012-11-13merged develop back inPeter 'Pita' Martischka
2012-11-13Merged branch feature/frontend-testsPeter 'Pita' Martischka
2012-11-13Adjust border-color of #sidediv0ip
2012-11-12Add ability to set language via URL parameter0ip
2012-11-12Make L10n.js requireableMarcel Klehr
2012-11-12Add pad setting for UI langMarcel Klehr
2012-11-10Add i18n componentMarcel Klehr
2012-11-08Update src/static/js/pad.jsMike Brousseau
2012-11-06Resolve #583John McLear
2012-11-06resolve #1131 make textarea resizeJohn McLear
2012-11-05Merge pull request #1120 from Pita/feature/settings-adminJohn McLear
2012-11-03merged develop back inPeter 'Pita' Martischka
2012-11-02Make express restart - I think this reloads settingsjohnyma22
2012-11-02make stuff workjohnyma22
2012-11-02remove cruft from js and move minify json to seperate file and also send emit...johnyma22
2012-11-02actually using text area is a lot less stupidjohnyma22
2012-11-02fix imported ol that were turned into ulChia-liang Kao
2012-11-02Start putting file system together for admin settings, no where near completejohnyma22
2012-10-30JS fix for #1077 fire event at start because of the resize issue, this is a c...johnyma22
2012-10-30fixes a tiny css bug #1077johnyma22
2012-10-30Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend...johnyma22
2012-10-29Merge pull request #1098 from Pita/span-two-lines-on-less-than-400pxJohn McLear
2012-10-29fix rtl sanityjohnyma22
2012-10-29make anything less than 400px span 2 lines on toolbar and make popups appear ...johnyma22
2012-10-29Merge pull request #1097 from Pita/developPeter 'Pita' Martischka
2012-10-28add a keystroke check for chat and make it so the chat listens on event 13 as...John McLear
2012-10-28Mimic, replace or work around removed npm utils.Marcel Klehr
2012-10-27Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend...Peter 'Pita' Martischka
2012-10-23Do not assume window object existsChia-liang Kao
2012-10-16Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexpJohn McLear
2012-10-16Fix #1067 Corrected exports links regexpMarcel Klehr
2012-10-12fix Pita/etherpad-lite #1032NAGOYA, Yoshihiko
2012-10-04attempt to move onClick away from HTML.. This is requiredjohnyma22
2012-10-04Merge pull request #1004 from yourcelf/developJohn McLear