Commit graph

  • e702a86c9f Add ability to reload settings Marcel Klehr 2012-11-06 17:35:05 +01:00
  • 7febd3ff5c Resolve #583 John McLear 2012-11-06 12:37:35 +00:00
  • 04166f4fbc Merge pull request #1134 from Pita/resize-settings-textarea John McLear 2012-11-06 03:59:22 -08:00
  • c034fe4aea Merge f68bdde0c1 into 28bcdcec25 John McLear 2012-11-06 03:57:42 -08:00
  • f68bdde0c1 resolve #1131 make textarea resize John McLear 2012-11-06 11:56:19 +00:00
  • 28bcdcec25 Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter John McLear 2012-11-06 03:08:25 -08:00
  • bb91107134 Removed limitation of the colorpicker color space Fritz Grimpen 2012-11-06 08:39:56 +00:00
  • 581297b7bb Merge a575de7884 into 6f1bab5faf Wikinaut 2012-11-05 10:22:44 -08:00
  • 6f1bab5faf correct links to example settings.json files John McLear 2012-11-05 13:16:07 +00:00
  • b9541f938b Merge pull request #1127 from Pita/admin-page John McLear 2012-11-05 04:59:01 -08:00
  • 35428e9258 Merge 3766858dd2 into 051927cbc8 John McLear 2012-11-05 04:58:42 -08:00
  • 3766858dd2 add express endpoint for admin index.html John McLear 2012-11-05 12:58:02 +00:00
  • 051927cbc8 Merge pull request #1126 from Pita/remove-available-plugins-folder John McLear 2012-11-05 04:49:09 -08:00
  • 79c664f1bc Merge b6b99f7389 into b6a331b9ec John McLear 2012-11-05 04:49:05 -08:00
  • b6a331b9ec Merge pull request #1120 from Pita/feature/settings-admin John McLear 2012-11-05 04:48:59 -08:00
  • 6d8f39582e Merge 2f123970e6 into dfa0ae9181 John McLear 2012-11-05 04:48:54 -08:00
  • dfa0ae9181 Merge pull request #893 from marcelklehr/feature/plugin-settings John McLear 2012-11-05 04:48:47 -08:00
  • 2e865a2859 Merge b0099a4aba into 0fa25264bc Marcel Klehr 2012-11-05 04:48:30 -08:00
  • b6b99f7389 @redhog said its okay to remove this folder as it serves no purpose John McLear 2012-11-05 12:44:05 +00:00
  • a575de7884 allow favicon.ico as pad name Wikinaut 2012-11-04 13:02:55 +01:00
  • c92b5283fd fix #377: add favicon url as optional settings.json parameter Wikinaut 2012-11-04 11:26:17 +01:00
  • d122e28232 Fixed clear authorship test in IE 10 Peter 'Pita' Martischka 2012-11-04 00:25:54 +00:00
  • 1e27fa1475 rewrote change user name tests to do what John probably wanted to do Peter 'Pita' Martischka 2012-11-03 23:52:17 +00:00
  • cd368b5f8e Various improvments of the helper Peter 'Pita' Martischka 2012-11-03 23:48:10 +00:00
  • ebef2d2141 deactivated the timeslider test for now Peter 'Pita' Martischka 2012-11-03 22:37:25 +00:00
  • 922e47f8bd Fixed change user name test Peter 'Pita' Martischka 2012-11-03 22:36:36 +00:00
  • f30300d6fd Fixed helper waitFor test Peter 'Pita' Martischka 2012-11-03 22:20:27 +00:00
  • 4944dcbd1c fixed change user name test Peter 'Pita' Martischka 2012-11-03 22:16:44 +00:00
  • c5b68bb6ca Fixed clear authorship test Peter 'Pita' Martischka 2012-11-03 22:02:09 +00:00
  • 23e5c952d8 bump travis Peter 'Pita' Martischka 2012-11-03 18:19:26 +00:00
  • 6408581adb merged develop back in Peter 'Pita' Martischka 2012-11-03 18:16:36 +00:00
  • ba1115376f split long log lines Peter 'Pita' Martischka 2012-11-03 18:14:54 +00:00
  • 0fa25264bc Merge pull request #1119 from clkao/import-ol Marcel Klehr 2012-11-03 11:11:34 -07:00
  • 08a2d28a99 build sauce url after session got initalized Peter 'Pita' Martischka 2012-11-03 18:09:58 +00:00
  • 801ed8646b output sauce test url Peter 'Pita' Martischka 2012-11-03 17:51:01 +00:00
  • 8d6dbd2bf6 Make sauce sessions public Peter 'Pita' Martischka 2012-11-03 17:46:02 +00:00
  • a5870b94df on error logging didn't work really well Peter 'Pita' Martischka 2012-11-03 17:26:55 +00:00
  • c99a256acd Download sauce connect from google drive, thats much faster Peter 'Pita' Martischka 2012-11-03 17:10:37 +00:00
  • 3ee4fadf8a workaround for IE8's stupidness, use a \n for new lines Peter 'Pita' Martischka 2012-11-03 17:02:28 +00:00
  • 7aae29114b kill hanging tests Peter 'Pita' Martischka 2012-11-03 16:51:37 +00:00
  • 95f17d490d typo Peter 'Pita' Martischka 2012-11-03 16:50:48 +00:00
  • 600d428ec2 I'm so stupid... Peter 'Pita' Martischka 2012-11-03 16:21:28 +00:00
  • 401243e9b0 Don't test with browsers with very low usage Peter 'Pita' Martischka 2012-11-03 16:20:05 +00:00
  • ecdd39bca6 Let's try 5 tests in parrallel Peter 'Pita' Martischka 2012-11-03 16:11:41 +00:00
  • 5e90db6487 another typo Peter 'Pita' Martischka 2012-11-03 16:11:15 +00:00
  • ac3ff4f66d Only test in node.js 0.8 Peter 'Pita' Martischka 2012-11-03 16:07:32 +00:00
  • 4e4c720cb0 fixed type Peter 'Pita' Martischka 2012-11-03 16:05:12 +00:00
  • 0fd6051f52 test in different browsers Peter 'Pita' Martischka 2012-11-03 15:55:14 +00:00
  • 33daf5d80f Merge 8a92828b10 into 3944517aff François Boulogne 2012-11-03 08:20:04 -07:00
  • 8a92828b10 remove extra spaces François Boulogne 2012-11-03 16:10:41 +01:00
  • ab6adc7216 removed captialization Peter 'Pita' Martischka 2012-11-03 14:56:34 +00:00
  • dfe3b8d17f test also with node.js v0.6 + notify irc about test results Peter 'Pita' Martischka 2012-11-03 14:36:59 +00:00
  • c0394138f8 Ensure all tests are excecuted in sauce + better test result output Peter 'Pita' Martischka 2012-11-03 14:31:33 +00:00
  • e29f47ea35 less red Peter 'Pita' Martischka 2012-11-03 13:39:31 +00:00
  • 90e1014688 Colors :) Peter 'Pita' Martischka 2012-11-03 13:20:44 +00:00
  • d5c7da9612 nothing must be escaped in mediawiki François Boulogne 2012-11-03 11:33:45 +01:00
  • 2f123970e6 Make express restart - I think this reloads settings johnyma22 2012-11-02 15:21:12 +00:00
  • 1d055f2cd4 make stuff work johnyma22 2012-11-02 15:15:13 +00:00
  • 3ca450fefc make the server save settings johnyma22 2012-11-02 15:10:01 +00:00
  • 7fa5dd757e remove cruft from js and move minify json to seperate file and also send emit back to server on save settings johnyma22 2012-11-02 15:05:47 +00:00
  • f6fa897a4e actually using text area is a lot less stupid johnyma22 2012-11-02 14:31:52 +00:00
  • 04741167d9 Merge 4827cdbd96 into af3513873f Chia-liang Kao 2012-11-02 06:41:21 -07:00
  • 4827cdbd96 fix imported ol that were turned into ul Chia-liang Kao 2012-11-02 21:39:34 +08:00
  • 89e38ed4c2 Start putting file system together for admin settings, no where near complete johnyma22 2012-11-02 13:16:15 +00:00
  • d1bf009071 add Mediawiki support François Boulogne 2012-11-02 14:06:48 +01:00
  • af3513873f Merge pull request #1118 from marcelklehr/feature/customize-app-title John McLear 2012-11-02 05:59:15 -07:00
  • 92b5bf662e Merge 6d543fbcb3 into b9f4e8450c Marcel Klehr 2012-11-02 04:34:00 -07:00
  • 6d543fbcb3 Add a setting for customizing the app title Marcel Klehr 2012-11-02 12:30:57 +01:00
  • 67f12493ed don't silent the full install deps step Peter 'Pita' Martischka 2012-11-01 23:48:53 +00:00
  • c8dfa6d7ae less noise Peter 'Pita' Martischka 2012-11-01 23:46:04 +00:00
  • b08d948ddd bump travis Peter 'Pita' Martischka 2012-11-01 23:25:10 +00:00
  • 9712e66de5 take control over remote test run Peter 'Pita' Martischka 2012-11-01 23:21:10 +00:00
  • 0409ebb30b bloody sauce connect logs... Peter 'Pita' Martischka 2012-11-01 23:20:28 +00:00
  • 1188dea8ff increase timeouts Peter 'Pita' Martischka 2012-11-01 23:19:59 +00:00
  • 82dfb2df21 run test lib for a minute in sauce with firefox Peter 'Pita' Martischka 2012-11-01 22:17:31 +00:00
  • d6d07570bf added webdriver to npm dependencies Peter 'Pita' Martischka 2012-11-01 22:03:51 +00:00
  • 1346222d1c keep sauce tunnel alive Peter 'Pita' Martischka 2012-11-01 21:46:50 +00:00
  • b9f4e8450c Merge pull request #1114 from marcelklehr/fix/admin-unimplemented-notice John McLear 2012-11-01 11:46:47 -07:00
  • fc040975de Merge 2d6e577683 into 2311b0fbb4 Marcel Klehr 2012-11-01 11:46:23 -07:00
  • 2d6e577683 Put up some '/admin doesn't exist' notice. Marcel Klehr 2012-11-01 19:45:26 +01:00
  • 1da39d3d1a Merge branch 'develop' of github.com:Pita/etherpad-lite into develop johnyma22 2012-11-01 18:31:02 +00:00
  • 2311b0fbb4 Merge pull request #1112 from marcelklehr/docs/custom-folder John McLear 2012-11-01 06:52:11 -07:00
  • 67e8154d60 Merge 6a027a1c2c into 5629063b9c Marcel Klehr 2012-11-01 06:49:01 -07:00
  • 6a027a1c2c [docs] Document custom static files. Marcel Klehr 2012-11-01 14:48:19 +01:00
  • 5629063b9c Allow robots.txt to be custom John McLear 2012-11-01 13:32:04 +00:00
  • 0cbacf5b4b Merge pull request #1111 from marcelklehr/feature/eejs-pass-args-to-hooks John McLear 2012-11-01 05:51:04 -07:00
  • d7d2f5de2d Merge branch 'feature/eejs-pass-args-to-hooks' of git://github.com/marcelklehr/etherpad-lite into develop johnyma22 2012-11-01 12:49:36 +00:00
  • eb48b85428 Merge ed2faa68c9 into 247072b6d1 Marcel Klehr 2012-11-01 05:46:35 -07:00
  • ed2faa68c9 Pass on the req object to eejs hooks Marcel Klehr 2012-11-01 13:44:59 +01:00
  • 059f6d280e Pass on the render args to all eejs hooks Marcel Klehr 2012-11-01 13:44:06 +01:00
  • 247072b6d1 Merge pull request #1109 from yourcelf/patch-1 John McLear 2012-10-31 12:31:33 -07:00
  • d071e92644 Merge 13cef386f8 into f676e90199 yourcelf 2012-10-31 12:28:49 -07:00
  • 13cef386f8 Add api docs for userColor query arg yourcelf 2012-10-31 16:28:12 -03:00
  • f676e90199 [docs] Fix assets: Rename doc/_assets to doc/assets Marcel Klehr 2012-10-31 18:12:12 +01:00
  • 3944517aff Merge pull request #1104 from Pita/release/releases-1.1.5 1.1.5 Marcel Klehr 2012-10-31 08:16:14 -07:00
  • ebdfb4d3af Merge 9cec0391e2 into e19c05d1c4 John McLear 2012-10-31 08:15:35 -07:00
  • 9cec0391e2 Improve changelog v1.1.5 Marcel Klehr 2012-10-31 16:15:12 +01:00
  • 28acfc70de Merge branch 'develop' of github.com:Pita/etherpad-lite into release/releases-1.1.5 John McLear 2012-10-31 12:32:12 +00:00
  • 437937c350 Merge pull request #1103 from marcelklehr/docs/http-api-versions John McLear 2012-10-31 05:26:10 -07:00
  • be99fedd86 Merge dd1e383d6e into d929877865 Marcel Klehr 2012-10-31 03:53:35 -07:00