Commit graph

  • 305e9871c7 Merge 5d12be940c into 019b25daa2 John McLear 2013-03-14 14:31:52 -07:00
  • 5d12be940c return text instead of html John McLear 2013-03-14 18:28:35 -03:00
  • 383439629a specialkey doesnt even exist afaik John McLear 2013-03-14 18:27:32 -03:00
  • 1bb9d1d625 remove pointless + John McLear 2013-03-14 18:23:27 -03:00
  • 019b25daa2 Merge pull request #1617 from ether/replace-html-with-text John McLear 2013-03-14 14:20:43 -07:00
  • 8cd9fc00fc Merge d72abceee7 into dab82ca380 John McLear 2013-03-14 14:20:27 -07:00
  • d72abceee7 escape .color John McLear 2013-03-14 18:18:14 -03:00
  • dab82ca380 Merge pull request #1616 from ether/ff-key-tests John McLear 2013-03-14 13:34:22 -07:00
  • 915170bec3 Merge 29c0d790b5 into f0dee2d2ce John McLear 2013-03-14 10:49:19 -07:00
  • 29c0d790b5 fix undo test John McLear 2013-03-14 14:48:23 -03:00
  • 24188d7007 this should pass more tests.. John McLear 2013-03-14 14:36:54 -03:00
  • 1462d8e80c now IE friendly John McLear 2013-03-14 14:22:58 -03:00
  • 6bac01009b missed an evt John McLear 2013-03-14 13:52:20 -03:00
  • 34c2cf40fa This isn't ideal, basically some browsers interact with keypress/keydown in different ways so this is a workaround but it's not perma John McLear 2013-03-14 13:51:23 -03:00
  • 12107859bb fix tests in firefox as firefox fires on keypress not down John McLear 2013-03-14 13:41:49 -03:00
  • ac9b972358 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg John McLear 2013-03-14 12:01:09 -03:00
  • f0dee2d2ce Merge pull request #1615 from ether/fix/admin-relative-links John McLear 2013-03-14 08:01:11 -07:00
  • 2f746d4c92 Merge 5fe60e7221 into 10231db103 Marcel Klehr 2013-03-14 08:00:41 -07:00
  • 5fe60e7221 redirect /admin to /admin/ so that the relative links work Marcel Klehr 2013-03-14 15:59:39 +01:00
  • 0d8c698622 Added test for ctrl+z feature/test_ctrl_z Peter "Pita" Martischka 2013-03-13 23:14:04 -07:00
  • 606f27a0a0 stop import from being able to nuke a pad fix-import-error John McLear 2013-03-13 21:13:57 -03:00
  • 10231db103 Merge pull request #1609 from ether/dont-crash-bad-author John McLear 2013-03-13 16:08:21 -07:00
  • b5d43b0437 Merge c30b0b72b8 into babb33d825 John McLear 2013-03-13 14:23:56 -07:00
  • c30b0b72b8 Validate all 'author' attribs of incoming changesets to be the same value as the current user's authorId Marcel Klehr 2013-03-13 22:23:35 +01:00
  • 0f7fdf39cc Merge 5639bde5ad into babb33d825 John McLear 2013-03-13 13:56:21 -07:00
  • babb33d825 add authorId to chat and userlist, possibly privacy/security issue? John McLear 2013-03-12 17:34:15 +00:00
  • 0bceac98e3 Merge pull request #1610 from ether/frontend-tests-refactor Marcel Klehr 2013-03-13 13:48:43 -07:00
  • 5d849e098b Merge b81be97f94 into acb4b4ebaf John McLear 2013-03-13 11:09:12 -07:00
  • b81be97f94 typo John McLear 2013-03-13 15:08:19 -03:00
  • 5690f2d01e not z, is b! John McLear 2013-03-13 15:06:08 -03:00
  • b4ec07312b add keystroke tests for relevant buttonpresses and change naming schema to something more sane John McLear 2013-03-13 15:00:04 -03:00
  • 988653b8ce Toolbar hooks cohitre 2013-03-12 19:36:04 -07:00
  • 5639bde5ad add authorId to chat and userlist, possibly privacy/security issue? authorID-in-userlist John McLear 2013-03-12 17:34:15 +00:00
  • 83a820b720 new function for handling custom messages, allows objects to be sent, before we only allowed strings John McLear 2013-03-12 16:59:15 +00:00
  • acb4b4ebaf Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-03-11 04:52:12 +00:00
  • 52aa7d3997 Registering commands on the ace toolbar cohitre 2013-03-10 15:42:12 -07:00
  • 304e43f2a1 Merge 292a3bd7b7 into 0717ac7b88 cohitre 2013-03-09 14:57:58 -08:00
  • 292a3bd7b7 Setting up the right toolbar. cohitre 2013-03-09 14:57:42 -08:00
  • 0717ac7b88 Merge pull request #1602 from ether/chrome-linux-indent John McLear 2013-03-08 08:21:49 -08:00
  • ca070db4b4 Merge 26a6765b50 into 0b16d96c97 John McLear 2013-03-08 08:21:35 -08:00
  • 26a6765b50 fix indent on chrome in linux John McLear 2013-03-08 08:40:40 -08:00
  • 65eaf87892 experimenting with webrtc, obviously do not merge this, it's purely a pointless experiment I'm struggling to get working webrtc-experiment John McLear 2013-03-07 17:16:40 +00:00
  • 0b16d96c97 Merge pull request #1527 from nelsonsilva/swagger John McLear 2013-03-07 08:07:46 -08:00
  • ec55cde065 Merge a5987285e0 into 732ad2878f Nelson Silva 2013-03-07 08:07:42 -08:00
  • 732ad2878f Merge pull request #1599 from jhollinger/develop John McLear 2013-03-07 06:50:01 -08:00
  • 84c720c245 Merge 3cafa24982 into f8e528bc42 Jordan Hollinger 2013-03-07 06:40:18 -08:00
  • 3cafa24982 Fix variable name typo in PadMessageHandler.padUsers Jordan Hollinger 2013-03-07 09:37:03 -05:00
  • f8e528bc42 Merge pull request #1598 from cebe/feature/import-to-all-dbms John McLear 2013-03-07 05:39:22 -08:00
  • 9d1eb640bd Merge 62c13b4c3f into 0c9214bb27 Carsten Brandt 2013-03-07 05:17:53 -08:00
  • 62c13b4c3f typo CeBe 2013-03-07 14:10:54 +01:00
  • 70c329957d additional ouput for importSqlFile CeBe 2013-03-07 14:05:55 +01:00
  • 4026ba1815 fixed saved data to be escaped properly CeBe 2013-03-07 13:15:29 +01:00
  • f2b173f566 improved output for importSqlFile CeBe 2013-03-06 22:38:18 +01:00
  • 76fbc29607 improved output for importSqlFile CeBe 2013-03-06 22:36:00 +01:00
  • 4b7238c2cd improved output for importSqlFile CeBe 2013-03-06 22:28:00 +01:00
  • db0d0d1f72 fixed problem with npm CeBe 2013-03-06 22:08:14 +01:00
  • 6dfc5f2c88 a script that allows importing old etherpad db CeBe 2013-03-06 18:16:30 +01:00
  • 844012864f Merge branch 'release/1.2.81' John McLear 2013-03-06 15:17:39 +00:00
  • 0c9214bb27 bump v and changelog 1.2.81 John McLear 2013-03-06 15:08:27 +00:00
  • 830357c81c Merge pull request #1596 from ether/rtl-ltr-tests John McLear 2013-03-06 07:03:01 -08:00
  • 2b0a0580b9 Merge 60df48e485 into 29d8482ce7 John McLear 2013-03-06 07:02:57 -08:00
  • 60df48e485 ltr test and fix rtl test John McLear 2013-03-06 15:02:05 +00:00
  • 29d8482ce7 Merge pull request #1595 from ether/safari-rtl-fix John McLear 2013-03-06 06:51:22 -08:00
  • 9c5500ceea Merge 1e94eaa06c into 7ada830e2e John McLear 2013-03-06 06:51:15 -08:00
  • 1e94eaa06c fix safari rtl dissapearing pad John McLear 2013-03-06 14:50:08 +00:00
  • 3dbbe282ea Also change 'dir'ection of ace_outer fix/rtl-option Marcel Klehr 2013-03-06 15:48:44 +01:00
  • 7ada830e2e Merge pull request #1594 from ether/fix/rtl-option John McLear 2013-03-06 06:48:43 -08:00
  • e8495cd5ba Merge 5731ef7802 into 2a8038b9fe Marcel Klehr 2013-03-06 06:40:46 -08:00
  • 5731ef7802 Fix ace rtlIsTrue property setter Marcel Klehr 2013-03-06 15:40:02 +01:00
  • 2a8038b9fe Merge pull request #1593 from marcelklehr/feature/rtl-pad-setting John McLear 2013-03-06 05:58:47 -08:00
  • 6fada785d9 Merge 760e1b82c3 into 603115c4bf Marcel Klehr 2013-03-06 05:58:22 -08:00
  • 603115c4bf Merge branch 'master' into develop Marcel Klehr 2013-03-06 14:57:09 +01:00
  • a5987285e0 Multiple REST endpoints (one per version) nelson.silva 2013-02-16 14:57:09 +00:00
  • 8f279a6710 Added some fixes to make it work with the codegen Nelson Silva 2013-02-15 14:10:03 +00:00
  • 1cfc8eda19 Initial work on swagger Nelson Silva 2013-02-13 16:29:01 +00:00
  • 760e1b82c3 Add a setting for RTL text direction (integrating the url paramter) Marcel Klehr 2013-03-05 23:12:00 +01:00
  • d464ea9817 Update settings.json.template Manuel Knitza 2013-03-05 22:36:51 +01:00
  • fe0272b283 Merge pull request #1589 from ether/fix-ctrl-z John McLear 2013-03-05 12:35:03 -08:00
  • b38e2c3c09 Merge f9f8b1c079 into d124d9b26c John McLear 2013-03-05 12:34:50 -08:00
  • d124d9b26c Merge pull request #1590 from ether/fix-tests-android John McLear 2013-03-05 12:34:44 -08:00
  • 4a6d4ce48f Merge 38499465c3 into 2b5cb2989c John McLear 2013-03-05 12:34:03 -08:00
  • f9f8b1c079 allow chrome to do control z type functionality, not sure why this was never in.. broken when we last updated jQ anyway John McLear 2013-03-05 20:30:31 +00:00
  • d8ca1b9139 Update settings.json.template Manuel Knitza 2013-03-05 21:29:44 +01:00
  • 67a0730710 added nodemailer to package.json - fix #1586 Manuel Knitza 2013-03-05 21:28:38 +01:00
  • 38499465c3 fix chat simulation test to work in android John McLear 2013-03-05 19:01:22 +00:00
  • cb2d148734 Merge branch 'release/1.2.8' John McLear 2013-03-05 13:39:53 +00:00
  • 2b5cb2989c Merge pull request #1585 from ether/changelog 1.2.8 John McLear 2013-03-05 05:34:14 -08:00
  • b290b2e8eb Merge 7f9a51e614 into dc4317b654 John McLear 2013-03-05 05:34:10 -08:00
  • 7f9a51e614 changelog John McLear 2013-03-05 13:33:09 +00:00
  • dc4317b654 Merge pull request #1584 from ether/update-ueber John McLear 2013-03-05 05:25:48 -08:00
  • 1d0a9ed3a5 Merge 3dee4098b0 into 283f6d0ae6 John McLear 2013-03-05 05:25:19 -08:00
  • 3dee4098b0 update ueberdb John McLear 2013-03-05 13:24:24 +00:00
  • 283f6d0ae6 Merge pull request #1581 from victorhooi/develop Marcel Klehr 2013-03-04 05:06:25 -08:00
  • 1b2bcb95d5 Merge aa9fd7621a into 6c304f0480 victorhooi 2013-03-04 04:03:27 -08:00
  • aa9fd7621a Remove nested /* */ from settings.json.template Victor Hooi 2013-03-05 05:58:03 +11:00
  • 6c304f0480 Localisation updates from http://translatewiki.net. Siebrand Mazeland 2013-03-04 11:46:05 +00:00
  • c57bc444cd basic toolbar setup cohitre 2013-03-03 15:53:17 -08:00
  • 2b62e9a211 Merge pull request #1578 from yourcelf/patch-2 Marcel Klehr 2013-03-03 13:34:18 -08:00
  • 2239219f48 Merge 44965f462b into 71f10bff5b yourcelf 2013-03-03 13:26:14 -08:00
  • 44965f462b Fix comma errors in settings.json.template yourcelf 2013-03-03 16:25:09 -05:00