Commit graph

  • 7b2388bb56 Allow the location/name of settings.json to be passed through an optional --settings arg Jordan 2012-02-16 00:22:53 -05:00
  • 9ca914f8cd Merge pull request #454 from cweider/fix-common-code Chad Weider 2012-02-15 13:40:21 -08:00
  • 9571d3e6dc Merge 2931382a10 into a8469dcdaa GitHub Merge Button 2012-02-15 13:39:21 -08:00
  • 2931382a10 Update require-kernel, which fixes #451. Chad Weider 2012-02-15 13:31:22 -08:00
  • 2fb1f7a3fd Merge f7d8f68c13 into a8469dcdaa GitHub Merge Button 2012-02-15 05:42:39 -08:00
  • a8469dcdaa Merge pull request #450 from drdla/master Peter 'Pita' Martischka 2012-02-15 05:42:36 -08:00
  • f7d8f68c13 fix duble error checking fix whitespace coding convention aritas1 2012-02-15 15:57:39 +04:00
  • 329ae440bd Merge f93fba2511 into 546aaae379 GitHub Merge Button 2012-02-14 14:52:42 -08:00
  • f93fba2511 Improved file structure and CSS coding style; also ran CSSLint on it; To be done: sprite and compress images drdla 2012-02-14 23:49:43 +01:00
  • 546aaae379 Merge branch 'modulize-share' Chad Weider 2012-02-14 12:10:41 -08:00
  • 9837cda257 Correct typo in 363e168561. Chad Weider 2012-02-14 12:09:42 -08:00
  • 8bff85cdb2 change listGroups output aritas1 2012-02-14 21:57:08 +04:00
  • 7869e4b69b undo last change aritas1 2012-02-14 21:45:29 +04:00
  • 206c2273bd Merge commit 'upstream/master' aritas1 2012-02-14 21:42:15 +04:00
  • 730b92084a fix listAllPads output type to get a behave like the listPads function aritas1 2012-02-14 21:37:37 +04:00
  • ebeb2da275 Merge pull request #422 from jhollinger/fix_listPads Peter 'Pita' Martischka 2012-02-14 09:22:18 -08:00
  • a5b5aff84c Merge 5fde0b548c into 5751a8e434 GitHub Merge Button 2012-02-14 09:21:48 -08:00
  • 5751a8e434 Merge pull request #352 from cweider/modulize-share Peter 'Pita' Martischka 2012-02-14 09:21:45 -08:00
  • 3224f64619 Merge e0d23e3c5d into da1fbaad9a GitHub Merge Button 2012-02-14 09:21:24 -08:00
  • da1fbaad9a Merge pull request #434 from jhollinger/unknown_message Peter 'Pita' Martischka 2012-02-14 09:21:20 -08:00
  • e60bdf4133 remove debug stuff aritas1 2012-02-14 19:52:52 +04:00
  • 5f5a909420 add listAllPads API function aritas1 2012-02-14 19:48:47 +04:00
  • 2466e65212 add comment and remove debug aritas1 2012-02-14 18:53:22 +04:00
  • 146ccc126b add a defaultGroup for the public pads aritas1 2012-02-14 18:50:04 +04:00
  • eebc308d2a add delete group form groups aritas1 2012-02-14 18:02:17 +04:00
  • 39c144eb00 Merge da23a62c49 into 8e6b451459 GitHub Merge Button 2012-02-13 20:48:30 -08:00
  • da23a62c49 Remove an unused collab client message Jordan 2012-02-09 21:55:47 -05:00
  • 0d3188365a Bugfix to noColors view option Jordan 2012-01-17 11:42:33 -05:00
  • 7ec4100f0f add listGroups to API fix wrong link in tests.html aritas1 2012-02-14 02:51:13 +04:00
  • 7cde49f981 Merge c19444f6c9 into 8e6b451459 GitHub Merge Button 2012-02-10 16:07:06 -08:00
  • e0d23e3c5d Create and use the Security module. Chad Weider 2012-01-18 03:58:13 -08:00
  • 363e168561 Share randomString method. Chad Weider 2012-01-28 17:38:23 -08:00
  • 34edba3adf Share createCookie and readCookie methods. Chad Weider 2012-01-26 22:42:58 -08:00
  • 7038f9a61d Drop the cssmanager_client module. Chad Weider 2012-01-17 03:51:00 -08:00
  • f6ac0b1926 Drop the linestylefilter_client module. Chad Weider 2012-01-17 03:48:36 -08:00
  • 3581a45491 Drop the domline_client module. Chad Weider 2012-01-17 03:46:15 -08:00
  • 4098cbe03b Drop the easysync* modules. Chad Weider 2012-01-17 03:43:10 -08:00
  • f8f80968ca Share the AttributePoolFactory, Changeset, and contentcollector modules. Chad Weider 2012-01-17 02:47:46 -08:00
  • 3dabe81989 Create a module to proxy client-side modules. Chad Weider 2012-01-16 03:07:25 -08:00
  • c19444f6c9 initial rewrite booo 2012-02-09 02:09:17 +01:00
  • e6e81135a7 remove code duplication booo 2012-02-08 15:52:13 +01:00
  • 736aaa2800 server.js: remove unused import booo 2012-02-08 15:38:18 +01:00
  • 3584e130f5 move url sanitizing function into module booo 2012-02-08 15:36:30 +01:00
  • 11a1ea0d80 move routes into modules (readonly, export, import) booo 2012-02-08 15:21:33 +01:00
  • 7d12ca2076 move 'api' routes into own module booo 2012-02-08 14:45:10 +01:00
  • b8c0bb2ea2 move 'static' routes into own module booo 2012-02-08 14:21:24 +01:00
  • 38354f6ae5 move 'debug' routes into own module booo 2012-02-08 13:57:04 +01:00
  • a35ab2b238 Merge remote branch 'upstream/master' into nice-pad-url Wikinaut 2012-02-07 23:09:33 +01:00
  • 86f4c6181c Merge 37c09595a3 into 8e6b451459 GitHub Merge Button 2012-02-07 08:02:42 -08:00
  • 8e6b451459 Merge pull request #424 from booo/master Peter 'Pita' Martischka 2012-02-07 08:02:39 -08:00
  • 1ec8f79772 Merge edfdb775fe into e74c9e1bc9 GitHub Merge Button 2012-02-07 08:02:01 -08:00
  • edfdb775fe package.json: upgrade clean-css package booo 2012-02-07 16:59:19 +01:00
  • 2199d5ebf4 Merge remote branch 'upstream/master' into nice-pad-url Wikinaut 2012-02-07 09:43:53 +01:00
  • 7f6f734dbc nice pad urls Wikinaut 2012-02-07 09:43:48 +01:00
  • 5fde0b548c HTTP API listPads should return an array Jordan 2012-02-06 21:10:37 -05:00
  • e74c9e1bc9 Merge pull request #420 from cweider/fix-colorpicker John McLear 2012-02-06 12:56:37 -08:00
  • ab9ed446d7 Merge b59c8a0c7e into 1df0cb5c34 GitHub Merge Button 2012-02-06 12:43:52 -08:00
  • b59c8a0c7e Fix #419: closeColorPicker is not defined. Chad Weider 2012-02-06 12:37:47 -08:00
  • 2f32f5a6aa IE does not support index of. Chad Weider 2012-02-06 12:36:45 -08:00
  • 1df0cb5c34 Merge pull request #411 from marcelklehr/master John McLear 2012-02-06 11:08:53 -08:00
  • 37c09595a3 Use tar -zxvf instead of just xf to avoid permission errors? TJ Rana 2012-02-06 13:45:55 -05:00
  • 9590e9f5c1 Merge c130a48d89 into 394d542d5e GitHub Merge Button 2012-02-06 08:49:56 -08:00
  • 394d542d5e fix jquery version regex to make @0ip happy Peter 'Pita' Martischka 2012-02-06 17:36:59 +01:00
  • dfa857d606 Updated ueberDB Peter 'Pita' Martischka 2012-02-06 17:29:27 +01:00
  • c130a48d89 Text contrast adjustment for chat time Marcel Klehr 2012-02-06 16:16:31 +01:00
  • 9e769571fa Text contrast adjustment for timeslider Marcel Klehr 2012-02-06 16:00:42 +01:00
  • 169bae6cc9 Tweak contrast factor for author colors in editor Marcel Klehr 2012-02-06 16:00:08 +01:00
  • d7e29dba0d Merge pull request #405 from cweider/remote-modules Peter 'Pita' Martischka 2012-02-06 03:57:20 -08:00
  • 50ab3b3901 Merge 64ae1c433f into 94b5998347 GitHub Merge Button 2012-02-06 03:35:26 -08:00
  • 94b5998347 Merge pull request #407 from impulzia/master Peter 'Pita' Martischka 2012-02-06 03:35:24 -08:00
  • 94358af6bb Merge 7a41cde51f into cbe0b6d6bb GitHub Merge Button 2012-02-05 22:33:03 -08:00
  • 7a41cde51f Add -k option in curl to check prefixtree to avoid check ssl certificate Pedro Gracia 2012-02-06 07:25:36 +01:00
  • 64ae1c433f Allow modules to be fetched remotely. Chad Weider 2012-01-30 21:49:04 -08:00
  • b5ddba8741 Update require-kernel, it includes a patch for relative paths. Chad Weider 2012-02-05 16:52:55 -08:00
  • 762d39f009 Move scripts to the bottom of the page. Chad Weider 2012-01-31 22:32:46 -08:00
  • 3123a0a25a Do not assign to globals until after initialization. Chad Weider 2012-01-30 19:24:50 -08:00
  • 4bf9b0c805 Always include the require kernel. Chad Weider 2012-01-30 21:37:39 -08:00
  • 348e7ef1d5 Define packaging for iframe JS in the same way as pad.js and timeslider.js. Chad Weider 2012-01-31 00:12:10 -08:00
  • 458b5a4f03 Combine tar and isolate, so that everything is done in one definition. Chad Weider 2012-01-31 14:29:48 -08:00
  • ddc74cd0f1 Make the comment a part of the module. Chad Weider 2012-01-31 14:03:10 -08:00
  • ebb5055ce8 Extract file retrieval. Chad Weider 2012-01-28 16:24:11 -08:00
  • e68413d998 Extract Ace.js file generation. Chad Weider 2012-01-22 18:29:00 -08:00
  • cbe0b6d6bb Merge pull request #404 from cweider/misc-fixins John McLear 2012-02-05 15:06:41 -08:00
  • 912478824e Merge 3678625c7c into e3b6072e77 GitHub Merge Button 2012-02-05 14:27:02 -08:00
  • 3678625c7c Remove dependencies on native map. Chad Weider 2012-01-31 21:20:33 -08:00
  • f010f3ae9d Remove redundant line. Chad Weider 2012-01-22 16:42:07 -08:00
  • b1d871d0fd Defer socket setup until initialization and on document ready. Chad Weider 2012-01-28 17:05:29 -08:00
  • 3fb62956b9 Plugins are injected and no longer exist in the global scope. Chad Weider 2012-02-05 11:13:43 -08:00
  • e3b6072e77 Merge pull request #403 from cweider/fix-jquery Peter 'Pita' Martischka 2012-02-05 13:43:26 -08:00
  • 6c6635ead5 Merge 7a03405bb0 into 8ade4c89d5 GitHub Merge Button 2012-02-05 13:42:10 -08:00
  • 7a03405bb0 Fix version check for jQuery 1.7.1 download. Chad Weider 2012-02-05 13:27:27 -08:00
  • 8ade4c89d5 Merge pull request #400 from elijh/master John McLear 2012-02-05 06:25:42 -08:00
  • f1ebccaa54 Merge 17e9cf71da into 200346ee5d GitHub Merge Button 2012-02-05 06:23:03 -08:00
  • 200346ee5d Allow parameter to be passed to always show cha ton side of screen John McLear 2012-02-05 14:23:01 +00:00
  • 74325b7b86 Merge branch 'master' of git://github.com/Pita/etherpad-lite into serverModule calcnerd256 2012-02-04 19:14:38 -06:00
  • 5af7e8da7f Merge remote branch 'upstream/master' into nice-pad-url Wikinaut 2012-02-05 00:38:23 +01:00
  • 17e9cf71da use english spelling: replace costumStart with customStart. elijah 2012-02-04 15:22:25 -08:00
  • 82bda0b0ab Merge pull request #398 from 0ip/vendor_pref John McLear 2012-02-04 09:57:12 -08:00
  • 4963806223 Merge dd9989c32a into 28c9a422ff GitHub Merge Button 2012-02-04 09:50:26 -08:00
  • dd9989c32a fixes automatic update Robin 2012-02-04 18:46:43 +01:00