Commit graph

  • 411984787a Implement POST requests for HTTP API Jordan 2011-11-18 21:52:12 -05:00
  • 5510ad1c90 Merge 95c9310be0 into a9540cb8b7 GitHub Merge Button 2011-11-18 14:14:44 -08:00
  • 95c9310be0 Implement API POST requests Jordan 2011-11-18 17:01:21 -05:00
  • 673d2c028b Merge branch 'master' of github.com:Pita/etherpad-lite Peter 'Pita' Martischka 2011-11-18 13:56:30 -08:00
  • 38742d12b9 Improved the README Peter 'Pita' Martischka 2011-11-18 13:56:26 -08:00
  • 0fc72bc7e7 auto-open on chat icon; auto-focus on chat input; fix for https://github.com/Pita/etherpad-lite/issues/208 Wikinaut 2011-11-18 07:43:51 +01:00
  • 9dadeeec86 Merge 97119b9bdd into a9540cb8b7 GitHub Merge Button 2011-11-17 19:27:42 -08:00
  • a9540cb8b7 Merge pull request #209 from soul9/master Peter 'Pita' Martischka 2011-11-17 19:27:40 -08:00
  • 0f490407cc Merge 7362992191 into fa9b36df0f GitHub Merge Button 2011-11-17 18:51:38 -08:00
  • 7362992191 Update README.md and settings.json.template: use mysql or sqlite for production John Soros 2011-11-18 03:49:00 +01:00
  • 66a9798615 Merge commit '419d2bb' into monospace Wikinaut 2011-11-17 20:39:04 +01:00
  • a26918c69e Hook the ImportHtml module into the API Lorenzo Gil Sanchez 2011-11-17 10:18:35 +01:00
  • 9fe6c11d87 Main implementation of the setHTML API Lorenzo Gil Sanchez 2011-11-17 10:17:52 +01:00
  • 09cb367d8e The contentcollector code is harder to adapt since it has the Changeset module as a dependency Lorenzo Gil Sanchez 2011-11-16 19:25:17 +01:00
  • fd056cf09c Adapt client code for its use in the server Lorenzo Gil Sanchez 2011-11-16 19:24:28 +01:00
  • 0d760f0dbb replace underscores back to spaces in page titles Wikinaut 2011-11-16 23:31:20 +01:00
  • 913c006152 my changes in pad2.js Wikinaut 2011-11-16 23:22:55 +01:00
  • 0a795724c8 my changes in pad2.js Wikinaut 2011-11-16 23:20:23 +01:00
  • 4e5e5edc8e Add jsdom as a dependency to be able to parse HTML in the server Lorenzo Gil Sanchez 2011-11-16 17:39:33 +01:00
  • fa9b36df0f Merge pull request #203 from andrehjr/issue187 Peter 'Pita' Martischka 2011-11-15 23:11:55 -08:00
  • 971f625df9 Merge 8e7e74170e into 6d190f517e GitHub Merge Button 2011-11-15 15:41:11 -08:00
  • 8e7e74170e Extract getUrlVars() function calls to a local var andrehjr 2011-11-15 21:36:26 -02:00
  • ce4d9df665 Fix issue #182: Pad forgets usernames andrehjr 2011-11-15 21:33:43 -02:00
  • 6d190f517e Merge pull request #184 from thomasf/issue158 Peter 'Pita' Martischka 2011-11-14 21:35:37 -08:00
  • dc2aafa062 changing spaces or slashes in padnames to underscores Wikinaut 2011-11-14 20:32:27 +01:00
  • 5185804f70 Merge branch 'master' of git://github.com/Pita/etherpad-lite Eric Martindale 2011-11-14 10:10:48 +00:00
  • 5ea8dd6b70 correcting the uri decoding, so that also non-ASCII characters are correctly shown in hml page titles Wikinaut 2011-11-14 09:00:18 +01:00
  • 4e104e8c83 changing index.html to prompt user to allow to change the random padname, for example to add a reasonable prefix Wikinaut 2011-11-14 08:51:37 +01:00
  • 916e900cf3 Merge remote branch 'upstream/master' Wikinaut 2011-11-14 08:32:46 +01:00
  • a6f7a63478 removed unneeded old parts from buildForWindows Peter 'Pita' Martischka 2011-11-13 21:18:23 -08:00
  • 646d6a4875 updated node.js version for buildForWindows Script to 0.6.1 Peter 'Pita' Martischka 2011-11-13 21:03:05 -08:00
  • 32f81bbf5e Merge 3bbb9f2ce7 into 9eac04aaa6 GitHub Merge Button 2011-11-13 20:58:20 -08:00
  • 7e105774c0 Merge 73711abd97 into 9eac04aaa6 GitHub Merge Button 2011-11-13 20:58:19 -08:00
  • 9eac04aaa6 Fixed a huge problem with the sessioninfos array Peter 'Pita' Martischka 2011-11-13 20:33:13 -08:00
  • a5a9592031 Revert "Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message" Peter 'Pita' Martischka 2011-11-13 20:25:22 -08:00
  • b3c75a619d index.html title -lite Wikinaut 2011-11-14 00:29:51 +01:00
  • bfafed3ef2 index.html Wikinaut 2011-11-14 00:26:46 +01:00
  • e1052a6a5d my version plus recent Wikinaut 2011-11-13 22:36:01 +01:00
  • dac828e8f6 Update static/index.html John McLear 2011-11-13 14:32:21 +00:00
  • 5f12744446 update ueberDB Peter 'Pita' Martischka 2011-11-12 17:32:30 -08:00
  • 820326dc2b Output more informations on message dropped Peter 'Pita' Martischka 2011-11-12 16:47:01 -08:00
  • 08fbc3c3bc Updated all dependencies Peter 'Pita' Martischka 2011-11-12 16:46:26 -08:00
  • 08e0c91204 removed the node v0.4 check, it works now with node v0.6 Peter 'Pita' Martischka 2011-11-12 16:46:10 -08:00
  • 17666339d0 Merge pull request #191 from Yaco-Sistemas/master Peter 'Pita' Martischka 2011-11-12 15:04:53 -08:00
  • fbc66f6059 Merge e4481ea22b into eecb45cbfd GitHub Merge Button 2011-11-12 10:30:40 -08:00
  • eecb45cbfd Focus on input box onLoad John McLear 2011-11-12 18:30:38 +00:00
  • 74fdfec1c2 removing my favicon from master Wikinaut 2011-11-10 22:48:20 +01:00
  • 223016d78d Revert "patch to allow user-added prefixes and modification to random pad names; correctly process uri-encoded utf-8 characters in pad names and page titles" Wikinaut 2011-11-10 22:42:30 +01:00
  • bda20a38a4 patch to allow user-added prefixes and modification to random pad names; correctly process uri-encoded utf-8 characters in pad names and page titles Wikinaut 2011-11-10 22:37:48 +01:00
  • b0976a292f Fixed a somewhat quirky random string generator, made another windows-only delay actually windows-only. jaseg 2011-11-10 11:37:12 +01:00
  • 082c732429 Modified the authentication stuff to grant access not based on plain password authentication but on a kind of 'timed cookies' so the password is not stored in plain text in some browser cookie. Also modded some random string generation funtions for elegance. jaseg 2011-11-09 23:53:00 +01:00
  • 5bef51f468 Merge remote branch 'upstream/master' Wikinaut 2011-11-10 00:21:37 +01:00
  • 2f0e45efe3 patch allows nice pad urls server/padname and also the old form server/p/padname; first commit to my remote repository Wikinaut 2011-11-10 00:06:43 +01:00
  • 6a75c45968 Merge pull request #197 from jaseg/master John McLear 2011-11-09 08:38:25 -08:00
  • 48a16bee76 Merge 4fc4a35381 into bf0fe9377d GitHub Merge Button 2011-11-09 08:35:57 -08:00
  • 4fc4a35381 Spelling fixes in log messages, made a delay windows-only which according to a comment should be windows-only, fixed a random filename generator. jaseg 2011-11-09 17:19:00 +01:00
  • bf0fe9377d Input fix for Wikinaut John McLear 2011-11-06 12:06:16 +00:00
  • f6165eb2ea Fixed another bug that breaked the abiword parser Peter 'Pita' Martischka 2011-11-05 19:34:01 +01:00
  • 90ba811bb5 Fixed a bug that creates invalid HTML at Export that lets Abiwords parser crash Peter 'Pita' Martischka 2011-11-04 03:15:26 +01:00
  • 73711abd97 Added comments Thomas Frössman 2011-11-03 07:34:51 +01:00
  • e4481ea22b Allow to get the HTML of the pad with the API Lorenzo Gil 2011-10-31 11:18:44 +01:00
  • 2cc7dcb751 Update package.json John McLear 2011-10-26 20:13:10 +02:00
  • 0f559347ee Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message Peter 'Pita' Martischka 2011-10-19 21:48:36 +02:00
  • e0cf6098fb fixing issues with bad import uploads, fixed #186 Peter 'Pita' Martischka 2011-10-19 21:46:28 +02:00
  • 3bbb9f2ce7 Revert "Updated node dependencies" Thomas Frössman 2011-10-18 10:12:31 +02:00
  • 6bab75eb3f Revert "Kind of a hack but makes issue #158 go away." Thomas Frössman 2011-10-18 10:12:08 +02:00
  • 3152f8cfb4 I'm getting json decode errors on a pad, needed additional debug output do investigate the db Thomas Frössman 2011-10-18 10:07:56 +02:00
  • cfb7dd8376 settings template does not reflect referneces in converter Thomas Frössman 2011-10-18 02:47:37 +02:00
  • 55e2f764d4 Updated node dependencies Thomas Frössman 2011-10-17 23:50:08 +02:00
  • 8223f84714 Kind of a hack but makes issue #158 go away. There is probably a deeper error somewhere in either log4js or express, I don't have the time to investigate that atm. Thomas Frössman 2011-10-17 23:31:39 +02:00
  • 85d54ee5c3 Merge branch 'master' of github.com:RolePlayGateway/etherpad-lite Eric Martindale 2011-10-15 01:35:48 +00:00
  • fb158d2eb8 Merge pull request #155 from johnyma22/master John McLear 2011-09-30 05:20:34 -07:00
  • 51a28123fb Merge 1bfd0e4707 into b6211ee6a5 GitHub Merge Button 2011-09-30 05:20:19 -07:00
  • b6211ee6a5 Merge pull request #174 from rspeer/master Peter 'Pita' Martischka 2011-09-30 01:50:20 -07:00
  • 4bec17847e Merge 2d3272e3b6 into 7e05b55156 GitHub Merge Button 2011-09-30 01:48:52 -07:00
  • 2d3272e3b6 make globalPads into an ad-hoc Object that can store values with arbitrary names. Fixes issue #160. Rob Speer 2011-09-30 00:41:46 -04:00
  • 7e05b55156 Merge pull request #170 from dsmedia/patch-1 Peter 'Pita' Martischka 2011-09-23 11:23:32 -07:00
  • 8687c91a1e Merge 46d85a1247 into ecd486e440 GitHub Merge Button 2011-09-23 11:22:39 -07:00
  • 46d85a1247 added "build-essential" to list of Ubuntu package dependencies for installing. dsmedia 2011-09-23 13:20:05 -05:00
  • 97119b9bdd forgot that change Marek Jawurek 2011-09-17 17:59:38 +02:00
  • 8fbc96dd7a added listAllPads API command, renamed listPads(GroupID) for Group Pads to listGroupPads(GroupID) Marek Jawurek 2011-09-17 17:58:00 +02:00
  • 928f91c7f7 Merge 95f1992e4d into ecd486e440 GitHub Merge Button 2011-09-14 03:37:35 -07:00
  • f890133871 Merge b835952e15 into 9b4cffb696 GitHub Merge Button 2011-09-14 03:29:10 -07:00
  • 1bfd0e4707 Allow authorship background colors to be disabled with a parameter John McLear 2011-09-04 13:48:53 +01:00
  • 9b4cffb696 Merge pull request #154 from krtek-net/develop John McLear 2011-09-03 08:27:22 -07:00
  • d736ba08e2 Merge 79a99546ed into 1b701fb317 GitHub Merge Button 2011-09-03 08:26:42 -07:00
  • 79a99546ed Czech translation Krtek Net 2011-09-03 17:13:03 +02:00
  • ecd486e440 Merge pull request #152 from chapel/main John McLear 2011-09-02 15:45:35 -07:00
  • 6e6902b5ad Merge a107f080a8 into 4d76ccde06 GitHub Merge Button 2011-09-02 13:02:59 -07:00
  • a107f080a8 fix username being set in querystrings Jacob Chapel 2011-09-02 12:51:51 -07:00
  • 9fbaddd0c3 Merge branch 'master' of git://github.com/Pita/etherpad-lite Mark Schmale 2011-09-02 14:12:06 +02:00
  • 4d76ccde06 Merge pull request #149 from adrianlang/master Peter 'Pita' Martischka 2011-09-01 14:51:59 -07:00
  • cee89c9902 Merge 7557af3db7 into a1a1017bfe GitHub Merge Button 2011-09-01 14:51:52 -07:00
  • 7557af3db7 Fix directory traversal fixing RegExp Adrian Lang 2011-09-01 23:24:51 +02:00
  • a1a1017bfe Merge pull request #148 from adrianlang/master Peter 'Pita' Martischka 2011-09-01 14:36:23 -07:00
  • 946d9423f3 Merge 86d3b2ba81 into 7e4bba0e31 GitHub Merge Button 2011-09-01 14:27:49 -07:00
  • 86d3b2ba81 Fix directory traversal Adrian Lang 2011-09-01 23:24:51 +02:00
  • 1b701fb317 Merge pull request #137 from tapio/develop John McLear 2011-09-01 11:49:59 -07:00
  • b835952e15 Add DokuWiki export Adrian Lang 2011-08-25 09:52:19 +02:00
  • 2da8215f03 Customizing for RPG. Eric Martindale 2011-08-30 20:02:04 +00:00