Commit graph

  • e28c16413a Merge fee4e959d0 into b7d0751b18 John McLear 2012-10-16 10:58:29 -07:00
  • fee4e959d0 fixes issue #1067 all kudos to analphabet and kingkaeru__ in #etherpad-lite-dev for the solution johnyma22 2012-10-16 18:56:50 +01:00
  • 3f54c00212 Merge d758bc407f into b7d0751b18 John McLear 2012-10-16 10:51:49 -07:00
  • d758bc407f fixes issue #1067 all kudos to analphabet and kingkaeru__ in #etherpad-lite-dev for the solution johnyma22 2012-10-16 18:49:00 +01:00
  • ac676c7d39 Merge branch 'develop' of github.com:Pita/etherpad-lite into fixes/focus-on-password-input johnyma22 2012-10-16 17:17:59 +01:00
  • 435ed471f3 Merge 59eb7b6e81 into e19c05d1c4 nicocesar 2012-10-15 09:41:43 -07:00
  • 59eb7b6e81 Merge remote-tracking branch 'upstream/master' Nico Cesar 2012-10-15 12:39:15 -04:00
  • b7d0751b18 couch, level, mongo, postgres, redis DB support John McLear 2012-10-15 13:09:55 +02:00
  • 9a9abc3230 make password focus on input when prompted johnyma22 2012-10-15 02:12:45 +01:00
  • 90b852ddad Merge de23d70920 into e19c05d1c4 Mark Schmale 2012-10-11 15:24:10 -07:00
  • de23d70920 Update bin/installDeps.sh Mark Schmale 2012-10-12 01:24:08 +03:00
  • c45739becb Update src/package.json John McLear 2012-10-11 23:38:56 +02:00
  • da9439d36e Merge pull request #1059 from lepidum/develop John McLear 2012-10-11 10:12:54 -07:00
  • c3ba6b9b74 Merge 250901bef5 into d7ec050f34 lepidum 2012-10-11 09:22:42 -07:00
  • 250901bef5 Merge pull request #3 from ayokura/fix-international-composition lepidum 2012-10-11 09:20:28 -07:00
  • 957a0aa873 fix Pita/etherpad-lite #1032 NAGOYA, Yoshihiko 2012-10-11 23:39:01 +09:00
  • e19c05d1c4 Merge pull request #1058 from Pita/release/releases-1.1.4 1.1.4 John McLear 2012-10-11 08:40:25 -07:00
  • 53e23322a6 Merge e4841212a6 into 3caa030c39 Marcel Klehr 2012-10-11 08:34:45 -07:00
  • e4841212a6 USERINFO_UPDATE: construct a new message for broadcast Richard Braakman 2012-10-02 23:27:30 +03:00
  • d7ec050f34 Merge pull request #1035 from amtep/develop John McLear 2012-10-11 08:27:27 -07:00
  • d68d97f8ab Merge 85b44119ae into bedc51d2e3 Richard Braakman 2012-10-11 08:21:40 -07:00
  • 8ea3ee080f fix for error handling in callback code Dmitry 2012-10-11 18:07:45 +04:00
  • bedc51d2e3 Merge pull request #1057 from dmitryuv/sync-processing Marcel Klehr 2012-10-11 08:08:47 -07:00
  • e0d4a16208 fixed variable name in handleMessageHook Dmitry 2012-10-11 17:51:57 +04:00
  • 3dede0528c Fix issue caused by broken async update Marcel Klehr 2012-10-11 16:54:27 +02:00
  • b0099a4aba Add plugin-specific sections in settings.json Marcel Klehr 2012-10-11 16:22:40 +02:00
  • 3327bbb750 Merge dbcdc2f956 into 1461c4e19a dmitryuv 2012-10-11 07:09:48 -07:00
  • dbcdc2f956 fix for error handling in callback code Dmitry 2012-10-11 18:07:45 +04:00
  • 1461c4e19a Merge pull request #1056 from dmitryuv/sync-processing Marcel Klehr 2012-10-11 07:05:51 -07:00
  • aadbb65ead Merge 0fa954c1a0 into 442c5714f9 dmitryuv 2012-10-11 07:00:22 -07:00
  • 0fa954c1a0 fixed variable name in handleMessageHook Dmitry 2012-10-11 17:51:57 +04:00
  • 256af47834 v0.9.0 seems to work fine Mark Schmale 2012-10-11 16:44:30 +03:00
  • 1704527b6f fixed variable name in handleMessageHook Dmitry 2012-10-11 17:18:28 +04:00
  • 07400f8360 Revert "fixed variable name in handleMessageHook" Dmitry 2012-10-11 17:17:41 +04:00
  • 93d30fc1a0 fixed variable name in handleMessageHook Dmitry 2012-10-11 17:10:04 +04:00
  • c975d81b41 clear authorship colors test johnyma22 2012-10-09 16:33:47 +01:00
  • f79bc7f1d8 simple check to ensure changing username change works johnyma22 2012-10-09 16:04:11 +01:00
  • d7c80ed41e keystroke enter spec johnyma22 2012-10-09 15:51:55 +01:00
  • 442c5714f9 Merge pull request #1049 from cweider/fix-express John McLear 2012-10-09 05:19:17 -07:00
  • 5fc077efc6 Merge 9d1274abaf into 90373964d3 Chad Weider 2012-10-09 01:37:31 -07:00
  • 9d1274abaf Drop method deprecated in Express 3.x. Chad Weider 2012-10-09 01:32:21 -07:00
  • aee6cb673a a non working chat always ons creen test johnyma22 2012-10-09 02:59:45 +01:00
  • 38321a0e77 strikethrough test johnyma22 2012-10-09 02:30:49 +01:00
  • def587f44f button ordered list test johnyma22 2012-10-09 02:27:22 +01:00
  • fbf509ce87 redo button johnyma22 2012-10-09 01:30:46 +01:00
  • 2db2683c98 an undo button test johnyma22 2012-10-09 00:52:46 +01:00
  • c9dd620e2a the first stages of a clear authorship color test johnyma22 2012-10-09 00:24:19 +01:00
  • 251ab842dd Merge branch 'develop' of git://github.com/Pita/etherpad-lite johnyma22 2012-10-09 00:13:51 +01:00
  • 87adcd7c14 clean up johnyma22 2012-10-09 00:13:45 +01:00
  • 0927b13f78 started button_indention test Peter 'Pita' Martischka 2012-10-08 21:04:09 +01:00
  • 6fefadee88 move sendkeys to lib folder Peter 'Pita' Martischka 2012-10-08 18:54:03 +01:00
  • a12c26c56e delete old backup file Peter 'Pita' Martischka 2012-10-08 18:50:02 +01:00
  • 82b4a953ee new index.html Peter 'Pita' Martischka 2012-10-08 18:49:40 +01:00
  • 397036db46 finished urls test Peter 'Pita' Martischka 2012-10-08 18:42:52 +01:00
  • 7adef188ff rewrote the embed values test Peter 'Pita' Martischka 2012-10-08 18:38:53 +01:00
  • bd47b6c40b the monospace test works now Peter 'Pita' Martischka 2012-10-08 14:13:35 +02:00
  • a4d68b2b25 runIn was a bad idea Peter 'Pita' Martischka 2012-10-08 14:07:56 +02:00
  • 27f9906b1e ensure we don't inject a second jquery Peter 'Pita' Martischka 2012-10-08 14:07:08 +02:00
  • d4c851875a added a runIn method to the helper Peter 'Pita' Martischka 2012-10-08 13:37:24 +02:00
  • ca6ebd6151 major restructering of the front end test framework Peter 'Pita' Martischka 2012-10-08 00:34:29 +02:00
  • 6587852138 fixed keystroke delete test Peter 'Pita' Martischka 2012-10-06 23:38:49 +02:00
  • 4c1561fcf6 improve test descriptions Peter 'Pita' Martischka 2012-10-06 23:38:17 +02:00
  • 35cea1e542 fixed the keystroke_urls_become_clickable.js test Peter 'Pita' Martischka 2012-10-06 21:45:46 +02:00
  • 7fd23c8d71 ported italic test to the new framework Peter 'Pita' Martischka 2012-10-06 21:34:20 +02:00
  • 3d96fe3d86 rewrote the testHelper Peter 'Pita' Martischka 2012-10-06 21:29:37 +02:00
  • 90373964d3 Remove two instances of the same function name John McLear 2012-10-06 02:36:51 +02:00
  • db1a1a0e3e Merge pull request #1034 from d-a-n/develop John McLear 2012-10-05 17:28:40 -07:00
  • 838029b0fb Merge 69b4eb57ac into a1280fd917 d-a-n 2012-10-05 13:46:15 -07:00
  • 69b4eb57ac Removed duplicate exports.getAuthorName d-a-n 2012-10-05 23:45:06 +03:00
  • ae25c085e0 a better way of geting href but note that it only works if we use settimeotu but settimeout breaks mocha so it's not okay. Peter please find a way of making sendkeys allow for callbacks, k tnx johnyma22 2012-10-05 00:38:07 +01:00
  • 9d7d973faa This is a superghetto hack fix for testing button_indentation, Peter please make it less horrible, tnx :) johnyma22 2012-10-05 00:14:46 +01:00
  • 84ec5abb8f more indentation testing but have hit a brick wall unable to get the second div inside the editor. I tried nth-child, next, find and children but to no avail. Anyone any ideas? johnyma22 2012-10-04 23:01:33 +01:00
  • 66a25adf62 put all scripts back into index johnyma22 2012-10-04 21:17:16 +01:00
  • 5c54b2c681 attempt to move onClick away from HTML.. This is required johnyma22 2012-10-04 21:16:58 +01:00
  • 7eecfa17b7 test for basic indent and outdent, needs more work johnyma22 2012-10-04 21:02:34 +01:00
  • edc8ff6a41 adding other tests back to index johnyma22 2012-10-04 20:44:42 +01:00
  • 7f819967f9 a script for testing font change johnyma22 2012-10-04 20:44:21 +01:00
  • fa9c5531e9 a test to check teh value of embed links johnyma22 2012-10-04 20:02:29 +01:00
  • ff22ae9206 fix keystroke delete test johnyma22 2012-10-04 19:12:01 +01:00
  • 1466b31c54 slightly uglier UI but still ugly johnyma22 2012-10-04 19:08:29 +01:00
  • 00b847273f Merge a521a12583 into a1280fd917 d-a-n 2012-10-04 11:05:24 -07:00
  • a1280fd917 Merge pull request #1004 from yourcelf/develop John McLear 2012-10-04 10:57:16 -07:00
  • ac5edd52f0 Merge 53113644a0 into a97c63b809 yourcelf 2012-10-04 10:56:45 -07:00
  • c74aed986e Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests johnyma22 2012-10-04 18:55:57 +01:00
  • a97c63b809 Fix issue caused by broken async update johnyma22 2012-10-04 18:53:02 +01:00
  • 07182bb716 Changed the send keys library so that its works with elements inside an iframe Peter 'Pita' Martischka 2012-10-04 16:22:05 +02:00
  • 95ce0aaba8 merged remote feature/frontend-tests Peter 'Pita' Martischka 2012-10-04 14:35:25 +02:00
  • 24988d659c This test should work, Peter, why does this test not work? johnyma22 2012-10-03 21:55:23 +01:00
  • 38ef46449b add delete stroke test to index page of /tests/frontend johnyma22 2012-10-03 21:26:48 +01:00
  • 339ee6d2e0 working keystroke delete check johnyma22 2012-10-03 21:25:31 +01:00
  • aa41ebcd6d include a sendkeys library to emulate sending keypresses johnyma22 2012-10-03 21:15:56 +01:00
  • 7820e3eb7c beginning of keystroke test johnyma22 2012-10-03 20:57:04 +01:00
  • 54a77458d6 clean up helper file johnyma22 2012-10-03 20:56:52 +01:00
  • 3caa030c39 Merge pull request #1040 from Pita/release/releases-1.1.3 1.1.3 John McLear 2012-10-03 10:08:44 -07:00
  • 299304d516 Merge f408d0f9c7 into a2394fc3a6 John McLear 2012-10-03 09:48:05 -07:00
  • 7aee98bce8 made test helpers more cross browser compatible Peter 'Pita' Martischka 2012-10-03 17:37:48 +01:00
  • 66475f32f3 Merge pull request #1003 from Pita/express-v3 origin/release/releases-1.1.3 John McLear 2012-10-03 06:25:44 -07:00
  • 2dfb2edead Merge 2684a1d295 into f408d0f9c7 Marcel Klehr 2012-10-03 06:24:25 -07:00
  • f408d0f9c7 Merge pull request #1038 from cweider/fix-relative John McLear 2012-10-03 06:16:28 -07:00
  • a521a12583 Changed pad_id to padID to follow projct standards. d-a-n 2012-10-03 15:50:43 +03:00