John McLear
|
55a2f46ca9
|
https://github.com/Pita/etherpad-lite/issues/143 - needs to be included with earlier commit that should still be in master if pita didn't remove. This fixes the bug where a url without http:// wouldnt be detected as a url and then a subsequent bug I am the father of where it would detect it as a user, open a new page but fudge up the url and make the page fail to load.
|
2011-11-20 04:24:58 +00:00 |
John McLear
|
697201b3de
|
Addresses https://github.com/Pita/etherpad-lite/issues/173 but needs a lot of testing and a word of warning, at current doing shift tab deletes the previous character as it emulates a backspace.
|
2011-11-20 03:52:19 +00:00 |
Peter 'Pita' Martischka
|
2e79bd50a3
|
fixed socket.io logging
|
2011-11-19 14:14:31 -08:00 |
Peter 'Pita' Martischka
|
53bf7dc19d
|
This should fix the IE Cursor Issue #171
|
2011-11-19 12:30:12 -08:00 |
Peter 'Pita' Martischka
|
7a7869a602
|
Revert "Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note that this only supports links beginning in www. We also support https:// etc. so we should encourage users to properly urls. For example: beta.etherpad.org would not be detected by this. "
This reverts commit d5e303ec9f .
|
2011-11-19 12:20:24 -08:00 |
Peter 'Pita' Martischka
|
a6b4260cc9
|
Updated JQuery to 1.7, thx to @wikinaut
|
2011-11-19 12:18:21 -08:00 |
Peter 'Pita' Martischka
|
2f16dff0ba
|
Merge branch 'master' of https://github.com/jhollinger/etherpad-lite
|
2011-11-19 12:08:57 -08:00 |
Peter 'Pita' Martischka
|
54c8e46cdf
|
Fixed Joes typo commit
|
2011-11-19 12:07:39 -08:00 |
Peter 'Pita' Martischka
|
0123fa0838
|
Merge branch 'master' of https://github.com/holtzermann17/etherpad-lite
|
2011-11-19 11:58:33 -08:00 |
Peter 'Pita' Martischka
|
e12049ef5b
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2011-11-19 11:27:02 -08:00 |
Joe Corneli
|
0aa56136fe
|
Fix message typos
|
2011-11-19 19:21:23 +00:00 |
John McLear
|
d5e303ec9f
|
Follow Link in Pad - https://github.com/Pita/etherpad-lite/issues/143 -- Note that this only supports links beginning in www. We also support https:// etc. so we should encourage users to properly urls. For example: beta.etherpad.org would not be detected by this.
|
2011-11-19 19:19:33 +00:00 |
Jordan
|
411984787a
|
Implement POST requests for HTTP API
|
2011-11-18 21:52:12 -05:00 |
Peter 'Pita' Martischka
|
673d2c028b
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2011-11-18 13:56:30 -08:00 |
Peter 'Pita' Martischka
|
38742d12b9
|
Improved the README
|
2011-11-18 13:56:26 -08:00 |
Peter 'Pita' Martischka
|
a9540cb8b7
|
Merge pull request #209 from soul9/master
Document database usage on production servers
|
2011-11-17 19:27:40 -08:00 |
John Soros
|
7362992191
|
Update README.md and settings.json.template: use mysql or sqlite for production
|
2011-11-18 03:49:00 +01:00 |
Peter 'Pita' Martischka
|
fa9b36df0f
|
Merge pull request #203 from andrehjr/issue187
Fix issue # 187 Pad forgets usernames often
|
2011-11-15 23:11:55 -08:00 |
andrehjr
|
8e7e74170e
|
Extract getUrlVars() function calls to a local var
|
2011-11-15 21:36:26 -02:00 |
andrehjr
|
ce4d9df665
|
Fix issue #182: Pad forgets usernames
|
2011-11-15 21:33:43 -02:00 |
Peter 'Pita' Martischka
|
6d190f517e
|
Merge pull request #184 from thomasf/issue158
Kind of a hack but fixes issue #158
|
2011-11-14 21:35:37 -08:00 |
Peter 'Pita' Martischka
|
a6f7a63478
|
removed unneeded old parts from buildForWindows
|
2011-11-13 21:18:23 -08:00 |
Peter 'Pita' Martischka
|
646d6a4875
|
updated node.js version for buildForWindows Script to 0.6.1
|
2011-11-13 21:03:05 -08:00 |
Peter 'Pita' Martischka
|
9eac04aaa6
|
Fixed a huge problem with the sessioninfos array
|
2011-11-13 20:33:13 -08:00 |
Peter 'Pita' Martischka
|
a5a9592031
|
Revert "Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message"
This reverts commit 0f559347ee .
|
2011-11-13 20:25:22 -08:00 |
John McLear
|
dac828e8f6
|
Update static/index.html
|
2011-11-13 14:32:21 +00:00 |
Peter 'Pita' Martischka
|
5f12744446
|
update ueberDB
|
2011-11-12 17:32:30 -08:00 |
Peter 'Pita' Martischka
|
820326dc2b
|
Output more informations on message dropped
|
2011-11-12 16:47:01 -08:00 |
Peter 'Pita' Martischka
|
08fbc3c3bc
|
Updated all dependencies
|
2011-11-12 16:46:26 -08:00 |
Peter 'Pita' Martischka
|
08e0c91204
|
removed the node v0.4 check, it works now with node v0.6
|
2011-11-12 16:46:10 -08:00 |
Peter 'Pita' Martischka
|
17666339d0
|
Merge pull request #191 from Yaco-Sistemas/master
Get the HTML of a Pad via the API
|
2011-11-12 15:04:53 -08:00 |
John McLear
|
eecb45cbfd
|
Focus on input box onLoad
|
2011-11-12 18:30:38 +00:00 |
John McLear
|
6a75c45968
|
Merge pull request #197 from jaseg/master
Stuff I came across while reading the code: Spelling fixes and two small code patches.
|
2011-11-09 08:38:25 -08:00 |
jaseg
|
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.
|
2011-11-09 17:19:59 +01:00 |
John McLear
|
bf0fe9377d
|
Input fix for Wikinaut
|
2011-11-06 12:06:16 +00:00 |
Peter 'Pita' Martischka
|
f6165eb2ea
|
Fixed another bug that breaked the abiword parser
|
2011-11-05 19:34:01 +01:00 |
Peter 'Pita' Martischka
|
90ba811bb5
|
Fixed a bug that creates invalid HTML at Export that lets Abiwords parser crash
|
2011-11-04 03:15:26 +01:00 |
Thomas Frössman
|
73711abd97
|
Added comments
|
2011-11-03 07:34:51 +01:00 |
Lorenzo Gil
|
e4481ea22b
|
Allow to get the HTML of the pad with the API
|
2011-10-31 11:19:51 +01:00 |
John McLear
|
2cc7dcb751
|
Update package.json
|
2011-10-26 20:13:10 +02:00 |
Peter 'Pita' Martischka
|
0f559347ee
|
Fixing a bug that happens when a socket.io connection closes very early after a CLIENT_READY message
|
2011-10-19 21:48:36 +02:00 |
Peter 'Pita' Martischka
|
e0cf6098fb
|
fixing issues with bad import uploads, fixed #186
|
2011-10-19 21:46:28 +02:00 |
Thomas Frössman
|
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.
|
2011-10-17 23:31:39 +02:00 |
John McLear
|
fb158d2eb8
|
Merge pull request #155 from johnyma22/master
Can pass a parameter to disable author Colors.
|
2011-09-30 05:20:34 -07:00 |
Peter 'Pita' Martischka
|
b6211ee6a5
|
Merge pull request #174 from rspeer/master
Fix to globalPads -- resolves issue #160
|
2011-09-30 01:50:20 -07:00 |
Rob Speer
|
2d3272e3b6
|
make globalPads into an ad-hoc Object that can store values with arbitrary names. Fixes issue #160.
|
2011-09-30 00:41:46 -04:00 |
Peter 'Pita' Martischka
|
7e05b55156
|
Merge pull request #170 from dsmedia/patch-1
added "build-essential" to list of Ubuntu package dependencies for instal
|
2011-09-23 11:23:32 -07:00 |
dsmedia
|
46d85a1247
|
added "build-essential" to list of Ubuntu package dependencies for installing.
|
2011-09-23 13:20:05 -05:00 |
John McLear
|
1bfd0e4707
|
Allow authorship background colors to be disabled with a parameter
|
2011-09-04 13:48:53 +01:00 |
John McLear
|
ecd486e440
|
Merge pull request #152 from chapel/main
fix username being set in querystrings
|
2011-09-02 15:45:35 -07:00 |