Commit Graph

2233 Commits

Author SHA1 Message Date
Peter 'Pita' Martischka c5b68bb6ca Fixed clear authorship test 2012-11-03 22:02:09 +00:00
Peter 'Pita' Martischka 23e5c952d8 bump travis 2012-11-03 18:19:26 +00:00
Peter 'Pita' Martischka 6408581adb merged develop back in 2012-11-03 18:16:36 +00:00
Peter 'Pita' Martischka ba1115376f split long log lines 2012-11-03 18:14:54 +00:00
Marcel Klehr 0fa25264bc Merge pull request #1119 from clkao/import-ol
Import <ol>'s  as <ol>'s and not as <ul>'s!
2012-11-03 11:11:34 -07:00
Peter 'Pita' Martischka 08a2d28a99 build sauce url after session got initalized 2012-11-03 18:09:58 +00:00
Peter 'Pita' Martischka 801ed8646b output sauce test url 2012-11-03 17:51:01 +00:00
Peter 'Pita' Martischka 8d6dbd2bf6 Make sauce sessions public 2012-11-03 17:46:02 +00:00
Peter 'Pita' Martischka a5870b94df on error logging didn't work really well 2012-11-03 17:26:55 +00:00
Peter 'Pita' Martischka c99a256acd Download sauce connect from google drive, thats much faster 2012-11-03 17:10:37 +00:00
Peter 'Pita' Martischka 3ee4fadf8a workaround for IE8's stupidness, use a \n for new lines 2012-11-03 17:02:28 +00:00
Peter 'Pita' Martischka 7aae29114b kill hanging tests 2012-11-03 16:51:37 +00:00
Peter 'Pita' Martischka 95f17d490d typo 2012-11-03 16:50:48 +00:00
Peter 'Pita' Martischka 600d428ec2 I'm so stupid... 2012-11-03 16:21:28 +00:00
Peter 'Pita' Martischka 401243e9b0 Don't test with browsers with very low usage 2012-11-03 16:20:05 +00:00
Peter 'Pita' Martischka ecdd39bca6 Let's try 5 tests in parrallel 2012-11-03 16:11:41 +00:00
Peter 'Pita' Martischka 5e90db6487 another typo 2012-11-03 16:11:15 +00:00
Peter 'Pita' Martischka ac3ff4f66d Only test in node.js 0.8 2012-11-03 16:07:32 +00:00
Peter 'Pita' Martischka 4e4c720cb0 fixed type 2012-11-03 16:05:12 +00:00
Peter 'Pita' Martischka 0fd6051f52 test in different browsers 2012-11-03 15:55:14 +00:00
Peter 'Pita' Martischka ab6adc7216 removed captialization 2012-11-03 14:56:34 +00:00
Peter 'Pita' Martischka dfe3b8d17f test also with node.js v0.6 + notify irc about test results 2012-11-03 14:36:59 +00:00
Peter 'Pita' Martischka c0394138f8 Ensure all tests are excecuted in sauce + better test result output 2012-11-03 14:31:33 +00:00
Peter 'Pita' Martischka e29f47ea35 less red 2012-11-03 13:39:31 +00:00
Peter 'Pita' Martischka 90e1014688 Colors :) 2012-11-03 13:20:44 +00:00
johnyma22 2f123970e6 Make express restart - I think this reloads settings 2012-11-02 15:21:12 +00:00
johnyma22 1d055f2cd4 make stuff work 2012-11-02 15:15:13 +00:00
johnyma22 3ca450fefc make the server save settings 2012-11-02 15:10:01 +00:00
johnyma22 7fa5dd757e remove cruft from js and move minify json to seperate file and also send emit back to server on save settings 2012-11-02 15:05:47 +00:00
johnyma22 f6fa897a4e actually using text area is a lot less stupid 2012-11-02 14:31:52 +00:00
Chia-liang Kao 4827cdbd96 fix imported ol that were turned into ul 2012-11-02 21:39:40 +08:00
johnyma22 89e38ed4c2 Start putting file system together for admin settings, no where near complete 2012-11-02 13:16:15 +00:00
John McLear af3513873f Merge pull request #1118 from marcelklehr/feature/customize-app-title
Add a setting for customizing the app title
2012-11-02 05:59:15 -07:00
Marcel Klehr 6d543fbcb3 Add a setting for customizing the app title
the app title is inserted into the <title> of all tepmlates
2012-11-02 12:30:57 +01:00
Peter 'Pita' Martischka 67f12493ed don't silent the full install deps step 2012-11-01 23:48:53 +00:00
Peter 'Pita' Martischka c8dfa6d7ae less noise 2012-11-01 23:46:04 +00:00
Peter 'Pita' Martischka b08d948ddd bump travis 2012-11-01 23:25:10 +00:00
Peter 'Pita' Martischka 9712e66de5 take control over remote test run 2012-11-01 23:21:10 +00:00
Peter 'Pita' Martischka 0409ebb30b bloody sauce connect logs... 2012-11-01 23:20:28 +00:00
Peter 'Pita' Martischka 1188dea8ff increase timeouts 2012-11-01 23:19:59 +00:00
Peter 'Pita' Martischka 82dfb2df21 run test lib for a minute in sauce with firefox 2012-11-01 22:17:31 +00:00
Peter 'Pita' Martischka d6d07570bf added webdriver to npm dependencies 2012-11-01 22:03:51 +00:00
Peter 'Pita' Martischka 1346222d1c keep sauce tunnel alive 2012-11-01 21:46:50 +00:00
John McLear b9f4e8450c Merge pull request #1114 from marcelklehr/fix/admin-unimplemented-notice
Put up some '/admin doesn't exist' notice.
2012-11-01 11:46:47 -07:00
Marcel Klehr 2d6e577683 Put up some '/admin doesn't exist' notice. 2012-11-01 19:45:26 +01:00
johnyma22 1da39d3d1a Merge branch 'develop' of github.com:Pita/etherpad-lite into develop 2012-11-01 18:31:02 +00:00
John McLear 2311b0fbb4 Merge pull request #1112 from marcelklehr/docs/custom-folder
[docs] Document custom static files.
2012-11-01 06:52:11 -07:00
Marcel Klehr 6a027a1c2c [docs] Document custom static files. 2012-11-01 14:48:19 +01:00
John McLear 5629063b9c Allow robots.txt to be custom 2012-11-01 13:32:04 +00:00
John McLear 0cbacf5b4b Merge pull request #1111 from marcelklehr/feature/eejs-pass-args-to-hooks
Pass on the render args to all eejs hooks
2012-11-01 05:51:04 -07:00