summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-11-01change to proper IE checkJohn McLear
2014-11-01Merge branch 'develop' of github.com:ether/etherpad-lite into developJohn McLear
2014-11-01Fixes #1414John McLear
2014-11-01take line breaks and treat them appropriatly instead of creating a space for ...John McLear
2014-11-01Merge pull request #2116 from jdittrich/updateUnderscoreJohn McLear
2014-11-01Bump resolveJohn McLear
2014-11-01Update README.mdJohn McLear
2014-10-30bump ueberdb againJohn McLear
2014-10-30bump ueber to require working mysqlJohn McLear
2014-10-29Fix for MySQL issuesJohn McLear
2014-10-28changed link wording for readme plugin referencetalexand
2014-10-28Added explicit reference to plugins and themes in readmeTrevor Alexander
2014-10-27Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-24chrome browser change wrapping typeJohn McLear
2014-10-23Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-20Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-14bump resolveJohn McLear
2014-10-14bump swaggerJohn McLear
2014-10-14bump semverJohn McLear
2014-10-14Merge pull request #2272 from prtksxna/lang-testsJohn McLear
2014-10-14Update frontend language tests for new keyboard shortcut conventionPrateek Saxena
2014-10-14Merge pull request #2271 from prtksxna/keyboard-errorJohn McLear
2014-10-14Use 'evt.shiftKey' instead of matching 'charCodes'Prateek Saxena
2014-10-14Merge pull request #2270 from prtksxna/tooltipJohn McLear
2014-10-14Replace "-" with "+" in tooltips with keyboard shortcutsPrateek Saxena
2014-10-14Merge pull request #2269 from prtksxna/fonticonsJohn McLear
2014-10-14Merge pull request #2264 from prtksxna/a-span-titleJohn McLear
2014-10-14Add a subset of FontAwesome icons using FontelloPrateek Saxena
2014-10-12Merge pull request #2266 from prtksxna/list-keyboard-shortcutsJohn McLear
2014-10-12Add keyboard shortcuts for ordered and unordered lists and update tooltips #1987Prateek Saxena
2014-10-11Merge pull request #2265 from prtksxna/keyboard-shortcutJohn McLear
2014-10-11Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987Prateek Saxena
2014-10-11Move `title` attribute of buttons from `<span>` to `<a>`Prateek Saxena
2014-10-06Merge pull request #2261 from ether/fix-xss-on-useragentJohn McLear
2014-10-06I prefer this..John McLear
2014-10-06escape useragent before displayingJohn McLear
2014-10-06Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-05Merge pull request #2257 from 0ip/fix/user-countJohn McLear
2014-10-05Merge pull request #2258 from 0ip/fix/button-selectJohn McLear
2014-10-05Prevent selection on buttons0ip
2014-10-05Fix user count0ip
2014-10-03Merge pull request #2256 from 0ip/developJohn McLear
2014-10-03Fix import/export popup margin @ timeslider0ip
2014-10-03Fix active button ui0ip
2014-09-28Merge pull request #2252 from otetard/bugfix/fix_export_filenameJohn McLear
2014-09-28If exportFileName hook isn’t defined don’t return empty filename.Olivier Tétard
2014-09-27Merge pull request #2249 from Gared/support_npm2John McLear
2014-09-27Add support for npm 2Stefan
2014-09-23Merge pull request #2243 from mrshu/patch-1John McLear
2014-09-23readme: Add formatting sugar for readibilityMarek Šuppa