Kai Hermann
|
5838e7ee7f
|
fixed merge conflicts
|
2011-11-27 11:55:18 -08:00 |
|
Jean-Tiare Le Bigot
|
2cc47211f9
|
one more 'one line fix'. Fixes bullet list auto replacing indented text whenever a new char is appended to it. This was caused by 'bullet' being hardcoded in a regular expression :/
|
2011-11-27 19:10:22 +01:00 |
|
John McLear
|
f465ebaab9
|
Being mentioned in a chat
|
2011-11-27 16:35:20 +00:00 |
|
Peter 'Pita' Martischka
|
88a8853fda
|
Added a extractPadData Script
|
2011-11-27 05:32:31 +00:00 |
|
John McLear
|
9bfc78eac1
|
Applied 0ip's fix https://github.com/Pita/etherpad-lite/issues/233#issuecomment-2884908
|
2011-11-27 01:11:51 +00:00 |
|
Peter 'Pita' Martischka
|
f33af4700b
|
Merge pull request #242 from jaseg/master
Random filename generation fix, made a windows-only delay actually windows-only.
|
2011-11-26 12:23:44 -08:00 |
|
Peter 'Pita' Martischka
|
3aacc0a1eb
|
Merge pull request #222 from jhollinger/master
API-only access, per issue #150
|
2011-11-26 12:22:04 -08:00 |
|
John McLear
|
33c51e1b01
|
Second and final part of https://github.com/Pita/etherpad-lite/issues/233
|
2011-11-26 19:16:32 +00:00 |
|
John McLear
|
dd2d0d45f0
|
First part of https://github.com/Pita/etherpad-lite/issues/233
|
2011-11-26 19:15:43 +00:00 |
|
Peter 'Pita' Martischka
|
84e8fb94eb
|
Merge pull request #239 from riseuplabs/master
Fix for jquery version test: #234
|
2011-11-25 22:18:43 -08:00 |
|
Micah Anderson
|
28c5e3ffb1
|
Fix jquery version test: #234
|
2011-11-26 00:58:47 -05:00 |
|
Jordan
|
a491600487
|
editOnly should default to false
|
2011-11-25 21:24:00 -05:00 |
|
Peter 'Pita' Martischka
|
6bcd2886e9
|
Fixed some problems with the database convertion
|
2011-11-25 17:56:50 -08:00 |
|
Peter 'Pita' Martischka
|
932ad0eeeb
|
This may fixes the pdf convert issue
|
2011-11-25 16:58:00 -08:00 |
|
Peter 'Pita' Martischka
|
7296913cb0
|
fixed merge confilicts
|
2011-11-25 16:56:08 -08:00 |
|
Peter 'Pita' Martischka
|
54b912f352
|
Revert "This should fix the IE Cursor Issue #171"
This reverts commit 53bf7dc19d.
|
2011-11-25 16:10:21 -08:00 |
|
Peter 'Pita' Martischka
|
dc6d0cda68
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2011-11-25 16:08:24 -08:00 |
|
Peter 'Pita' Martischka
|
fa098d73cd
|
Do a reconnect on network problems. After 10s it gives up
|
2011-11-25 15:26:01 -08:00 |
|
Jean-Tiare Le Bigot
|
7d184a681a
|
fix indenting while cursor is in the line
|
2011-11-26 00:02:25 +01:00 |
|
John McLear
|
f61de98046
|
Merge pull request #232 from riseuplabs/master
Temp fix, @Pita may revert this. For now it gets things stable again
|
2011-11-25 10:47:12 -08:00 |
|
Micah Anderson
|
97e9eb84af
|
fix for #224
|
2011-11-25 13:39:33 -05:00 |
|
Jean-Tiare Le Bigot
|
9c14dcd498
|
updated menu bar labels
|
2011-11-25 11:19:22 +01:00 |
|
Jean-Tiare Le Bigot
|
caf8792974
|
applying/removing list now preserves the indentation level
|
2011-11-25 11:10:57 +01:00 |
|
Jean-Tiare Le Bigot
|
ea2e7d0550
|
added support for (de)indent of regular text
|
2011-11-25 10:29:31 +01:00 |
|
Jean-Tiare Le Bigot
|
6b11ae330d
|
added handling of de-indenting when already on higher level
|
2011-11-25 09:13:03 +01:00 |
|
John McLear
|
40fcc83a05
|
Merge pull request #227 from jtlebi/origin/shift-tab
handle shift+tab, trivial fix
|
2011-11-24 08:04:04 -08:00 |
|
John McLear
|
89e3778a2c
|
Merge pull request #228 from alx/readonly-checkbox
add checkbox to limit number of inputs in embed window
|
2011-11-24 08:01:23 -08:00 |
|
Alexandre Girard
|
7a7b3391fb
|
add checkbox to limit number of inputs
|
2011-11-24 16:34:28 +01:00 |
|
Jean-Tiare Le Bigot
|
42341f2b2f
|
handle shift+tab, trivial fix
|
2011-11-24 15:29:45 +01:00 |
|
John McLear
|
ccaa21a04a
|
Styling for the new embed options
|
2011-11-23 15:49:22 +00:00 |
|
John McLear
|
dedd604125
|
Add support for embedding read only etc.
|
2011-11-23 15:46:34 +00:00 |
|
John McLear
|
2db81050f1
|
Fixes "I did more testing and there are a few issues that comes up. If you type anything starting with www then that entire phrase becomes an anchor tag, even if there is a space after the www. So for example in the sentence "Put www at the start of the address" "www at" would become an anchor. The regex need updating to require a dot after the www, which I think would fix the issue, but my regex knowledge is not great."
|
2011-11-22 21:03:50 +00:00 |
|
Lorenzo Gil Sanchez
|
943f8c4682
|
Stupid syntax error due to last minute refactoring
|
2011-11-22 16:09:27 +01:00 |
|
Lorenzo Gil Sanchez
|
e6de06b103
|
Transform multiline HTML into a single line stream to avoid spurious lines in the final result
|
2011-11-22 10:09:10 +01:00 |
|
Jordan
|
6297e628eb
|
Permissions checks on pad and timeslider in server.js are redudant
|
2011-11-21 15:51:54 -05:00 |
|
Jordan
|
5e7c5d5dd3
|
Add editOnly option
|
2011-11-21 12:44:33 -05:00 |
|
Jordan
|
5630889fb0
|
A more precise description of the requireSession setting
|
2011-11-21 11:54:29 -05:00 |
|
John McLear
|
49e28ddc05
|
Merge pull request #220 from alx/apikey-trim
fix issue with newline in APIKEY.txt when checking api key
|
2011-11-21 07:57:17 -08:00 |
|
Alexandre Girard
|
90e9d552f0
|
fix issue with newline in APIKEY.txt when checking api key
|
2011-11-21 16:39:54 +01:00 |
|
Jordan
|
9850ba43ee
|
Implement a 'requireSession' mode, which requires any user to have a valid session
|
2011-11-21 01:45:37 -05:00 |
|
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 |
|