summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-15Merge branch 'release/1.2.9'Marcel Klehr
2013-03-15release v1.2.9Marcel Klehr
2013-03-15Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesetsMarcel Klehr
Fix clearing authorship colors which was broken by #1609
2013-03-15Fix clearing authorship colors which was broken by #1609Marcel Klehr
Fixes #1620
2013-03-14Merge pull request #1618 from ether/tidy-upJohn McLear
Tidy up
2013-03-14return text instead of htmlJohn McLear
2013-03-14specialkey doesnt even exist afaikJohn McLear
2013-03-14remove pointless +John McLear
2013-03-14Merge pull request #1617 from ether/replace-html-with-textJohn McLear
escape .color
2013-03-14escape .colorJohn McLear
2013-03-14Merge pull request #1616 from ether/ff-key-testsJohn McLear
fix tests in firefox as firefox fires on keypress not down
2013-03-14fix undo testJohn McLear
2013-03-14this should pass more tests..John McLear
2013-03-14 now IE friendlyJohn McLear
2013-03-14missed an evtJohn McLear
2013-03-14This isn't ideal, basically some browsers interact with keypress/keydown in ↵John McLear
different ways so this is a workaround but it's not perma
2013-03-14fix tests in firefox as firefox fires on keypress not downJohn McLear
2013-03-14Merge pull request #1615 from ether/fix/admin-relative-linksJohn McLear
redirect /admin to /admin/ so that the relative links work
2013-03-14redirect /admin to /admin/ so that the relative links workMarcel Klehr
2013-03-13Merge pull request #1609 from ether/dont-crash-bad-authorJohn McLear
SECURITY PATCH: Don't crash pad if bad author data is passed to the server
2013-03-13Validate all 'author' attribs of incoming changesets to be the same value as ↵Marcel Klehr
the current user's authorId
2013-03-13add authorId to chat and userlist, possibly privacy/security issue?John McLear
2013-03-13Merge pull request #1610 from ether/frontend-tests-refactorMarcel Klehr
change test naming schema and add keystroke tests for relevant buttonpresses
2013-03-13typoJohn McLear
2013-03-13not z, is b!John McLear
2013-03-13add keystroke tests for relevant buttonpresses and change naming schema to ↵John McLear
something more sane
2013-03-11Localisation updates from http://translatewiki.net.Siebrand Mazeland
2013-03-08Merge pull request #1602 from ether/chrome-linux-indentJohn McLear
fix indent on chrome in linux
2013-03-08fix indent on chrome in linuxJohn McLear
2013-03-07Merge pull request #1527 from nelsonsilva/swaggerJohn McLear
Initial work on new swagger based REST API
2013-03-07Merge pull request #1599 from jhollinger/developJohn McLear
Fix padUsers API method
2013-03-07Fix variable name typo in PadMessageHandler.padUsersJordan Hollinger
2013-03-07Merge pull request #1598 from cebe/feature/import-to-all-dbmsJohn McLear
Created a script to import data to all dbms
2013-03-07typoCeBe
2013-03-07additional ouput for importSqlFileCeBe
2013-03-07fixed saved data to be escaped properlyCeBe
2013-03-06improved output for importSqlFileCeBe
2013-03-06improved output for importSqlFileCeBe
2013-03-06improved output for importSqlFileCeBe
2013-03-06fixed problem with npmCeBe
2013-03-06a script that allows importing old etherpad dbCeBe
this script allows you to import the sql file generated with convert.js into all supported dbms, not only MySQL
2013-03-06Merge branch 'release/1.2.81'John McLear
2013-03-06bump v and changelogJohn McLear
2013-03-06Merge pull request #1596 from ether/rtl-ltr-testsJohn McLear
ltr test and fix rtl test
2013-03-06ltr test and fix rtl testJohn McLear
2013-03-06Merge pull request #1595 from ether/safari-rtl-fixJohn McLear
fix safari rtl dissapearing pad
2013-03-06fix safari rtl dissapearing padJohn McLear
2013-03-06Merge pull request #1594 from ether/fix/rtl-optionJohn McLear
Fix ace rtlIsTrue property setter
2013-03-06Fix ace rtlIsTrue property setterMarcel Klehr
2013-03-06Merge pull request #1593 from marcelklehr/feature/rtl-pad-settingJohn McLear
Add a setting for RTL text direction (integrating the url paramter)