Chad Weider
548c527aaf
Move exposure of Ace2Editor closer to the code that requires it.
2012-01-22 09:46:08 -08:00
Peter 'Pita' Martischka
7a3e800fca
Merge branch 'master' of git://github.com/marcelklehr/etherpad-lite
2012-01-22 15:41:24 +01:00
Marcel Klehr
49061175c9
Text color changes based on author color
2012-01-22 13:30:25 +01:00
Robin
c0a0687fe9
It was definetely too late
2012-01-22 13:09:10 +01:00
0ip
3f8b03a900
Typo again
2012-01-22 02:15:02 +01:00
Robin
3c85a9cc6c
Typo
2012-01-22 00:13:00 +01:00
Robin
300886da34
Removed duplicates
2012-01-22 00:10:06 +01:00
John McLear
9f0ca7cc44
Remove alt key from Z to stop Polish people feeling sad
2012-01-17 16:50:35 +00:00
Peter 'Pita' Martischka
8f887262b0
Merge pull request #335 from johnyma22/importInstructions
...
Added a string to let people know to install abiword to enable import
2012-01-15 12:50:55 -08:00
Peter 'Pita' Martischka
a313c2570e
Merge pull request #331 from cweider/packaging-improvement
...
Packaging improvement
2012-01-15 12:48:41 -08:00
John McLear
eec22c4b70
Added a string to let people know to install abiword to enable import
2012-01-15 20:48:29 +00:00
Chad Weider
71a7c00abc
Merge adjacent scripts.
2012-01-15 12:10:29 -08:00
Chad Weider
a7bea30d83
Remove unnecessary quoting approach.
2012-01-15 11:27:08 -08:00
Chad Weider
9c91f16c71
Improve inlining of editor content.
...
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
2012-01-15 11:27:04 -08:00
John McLear
5f46ac2b01
Temporary fix that was breaking clicks inside of embedded pads
2012-01-15 18:24:18 +00:00
John McLear
6b49a56e01
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-15 17:59:42 +00:00
John McLear
e14fd22284
fix large left padding
2012-01-15 17:59:19 +00:00
0ip
1767e0f6e8
Update static/css/pad.css
2012-01-15 18:55:33 +01:00
Robin
960a79b77b
Added icon for ordered lists
2012-01-15 18:37:33 +01:00
John McLear
f4dca37a93
Ordered list support
2012-01-15 17:20:20 +00:00
Peter 'Pita' Martischka
c45932c6b8
Merge pull request #329 from cweider/security
...
Security [HTML Escaping]
2012-01-14 15:22:12 -08:00
Chad Weider
387dd4a48b
The value of all href attributes is escaped.
2012-01-14 14:50:23 -08:00
Chad Weider
6e36b59a59
All escaping functions replace HTML reserved characters.
2012-01-14 14:46:15 -08:00
Robin
f08e68c8f9
Addition for 720px phones (forgot index.html)
2012-01-14 21:41:41 +01:00
John McLear
30da7357e5
Merge pull request #326 from 0ip/fileinputfix
...
Fixed file input readability in Chrome
2012-01-14 07:24:34 -08:00
Peter 'Pita' Martischka
f9b0b10709
made 0ip images so that Pita likes them
2012-01-14 16:16:35 +01:00
Robin
42eee71295
Fixed file input readability in Chrome
2012-01-14 15:07:11 +01:00
Robin
8787897f60
Changed position values
2012-01-13 23:58:47 +01:00
Robin
20b63f1fa7
Merged and optimized icons
2012-01-13 23:58:01 +01:00
John McLear
642b716553
Merge pull request #289 from jhollinger/no_spaces
...
Sanitize pad names
2012-01-08 07:30:07 -08:00
John McLear
86902c2c0b
Merge pull request #291 from jhollinger/export_revisions
...
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
John McLear
7232dff6db
Merge pull request #306 from 0ip/patch-7
...
Disables line numbers on mobile devices (fix for #304 and #305 )
2012-01-08 06:49:56 -08:00
John McLear
dc2448d0e1
Merge pull request #313 from jhollinger/fix_ie_cursor
...
Fix cursor jump in IE when clicking edit buttons
2012-01-08 06:43:38 -08:00
TimWolla
12fc8226f0
Made pad.html more valid
...
- & -> &
- Removed duplicate ID in one Tag
2012-01-08 13:55:34 +01:00
Jordan
ca70a7772a
Fix cursor jump in IE when clicking edit buttons
2012-01-02 20:45:31 -05:00
0ip
9203ac2362
(1) Support for x*720px phones (like Galaxy Nexus) (2) Fix for user popup
2011-12-31 18:16:50 +01:00
0ip
2481c1cb4f
removed hackish code
2011-12-31 17:47:34 +01:00
0ip
a9a17e7360
properly disables line numbers on mobile devices (fix for #304 and #305 )
2011-12-31 17:46:10 +01:00
Jordan
2a86d57e46
Add ability to export specific pad revisions
2011-12-18 00:18:35 -05:00
Jordan
e8ef99fb72
Sanitize pad names
2011-12-16 15:41:11 -05:00
Peter 'Pita' Martischka
609701961e
Added some comments to help us documentating the code
2011-12-11 19:45:40 +01:00
John McLear
d20dcc7c57
fixed merge conflicts
2011-12-11 18:45:41 +01:00
Peter 'Pita' Martischka
3401a7bc11
small css fix at the importexport panel
2011-12-11 18:20:05 +01:00
Peter 'Pita' Martischka
c72cd49ede
Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki
2011-12-11 18:09:51 +01:00
0ip
4287cc283a
Fix for disappearing chat
2011-12-07 15:14:52 +01:00
ryrun
9616d5631f
Speed up line numbering of huge pads. Tested on chrome and firefox. Pad with more than 6000 lines will be loaded fast. It refresh first all current line numbers, then creates new with DocumentFragment and style.height info. Reflow(rebuild and rendering of dom) will be reduced to one for new ones, instead for each ones.
2011-12-07 14:23:28 +01:00
Adrian Lang
40c5e70aa7
Add DokuWiki export
2011-12-07 13:03:08 +01:00
John McLear
a444f11900
Merge pull request #275 from 0ip/patch-5
...
Mobile Patch [New]
2011-12-06 12:10:59 -08:00
0ip
89aac09c91
sorry for that, correct pad.html
2011-12-06 18:54:57 +01:00
0ip
95fe749791
Optimized index page for mobile devices
2011-12-06 18:48:28 +01:00
0ip
a4dad594d3
Optimized css for mobile devices
2011-12-06 18:46:40 +01:00
0ip
b615da194f
Optimized index page for mobile devices
2011-12-06 18:45:16 +01:00
0ip
9ad3aa0e4b
Updated chat for mobile devices
2011-12-06 18:43:30 +01:00
0ip
2dbe562bdc
Fix for 'Fix IE8 userpicker color issue' :)
2011-12-06 18:18:38 +01:00
Pierros Papadeas
3b1765bb23
Defining minimum Height and Width of Serialbox
2011-12-05 11:53:43 -08:00
John McLear
b2f1f04b54
Add support for hiding QR code via a parameter
2011-12-04 17:18:24 +01:00
John McLear
990a559a09
When noColors is set hide the clearAuthorship colors button
2011-12-04 17:17:44 +01:00
John McLear
a46a723b09
slight clean up
2011-12-04 17:17:16 +01:00
John McLear
dea5b05198
Fix IE8 userpicker color issue thanks to wikinaut now we can close off https://github.com/Pita/etherpad-lite/issues/233
2011-12-04 17:16:48 +01:00
0ip
1cf52682df
💅 Small fix for a recently introduced alignment-bug (10px are missing) + fixed gap between the checkbox and 'Read Only' @ Share and Embed dropdown
2011-12-02 22:47:29 +01:00
0ip
499e780c88
added related div to work properly
2011-12-02 20:39:23 +01:00
0ip
495b48056b
Minor bugfix: Solves http://j.mp/utOjbn
2011-12-02 20:36:02 +01:00
John McLear
9e509677dc
Merge pull request #231 from jtlebi/origin/shift-tab
...
(de)indent behaviour enhancement
2011-11-28 20:23:37 -08:00
John McLear
c8bfd21c03
Merge branch 'master' of https://github.com/Pita/etherpad-lite
2011-11-28 20:48:16 +00:00
John McLear
769892a736
Show QR code on read only and non read only options
2011-11-28 20:45:27 +00:00
Peter 'Pita' Martischka
ec56ca75ad
Fixed #135 , thx to @Wikinaut
2011-11-28 11:26:36 -08:00
Peter 'Pita' Martischka
e5d12f1d56
cherry picking @Yaco-Sistemas commit to fix IE 8
2011-11-28 11:18:47 -08:00
Peter 'Pita' Martischka
a2d3c6ddb2
Merge branch 'master' of git://github.com/Pita/etherpad-lite
2011-11-28 11:16:33 -08:00
John McLear
054af3da77
Change embe this pad to share and embed this pad
2011-11-28 02:42:30 +00:00
John McLear
90d36471b1
Remove read only link and place all functionality into embed option sorts issue #246
2011-11-27 21:04:11 +00:00
John McLear
19ee4865f4
Make the title changes Pita wanted which were show an increment and also fix the bug where it would keep increasing the title this is part of issue #125
2011-11-27 20:39:47 +00:00
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
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
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
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
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
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
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
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
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
Lorenzo Gil Sanchez
fd056cf09c
Adapt client code for its use in the server
2011-11-17 10:26:23 +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
