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
a313c2570e
Merge pull request #331 from cweider/packaging-improvement
...
Packaging improvement
2012-01-15 12:48:41 -08:00
eec22c4b70
Added a string to let people know to install abiword to enable import
2012-01-15 20:48:29 +00:00
71a7c00abc
Merge adjacent scripts.
2012-01-15 12:10:29 -08:00
a7bea30d83
Remove unnecessary quoting approach.
2012-01-15 11:27:08 -08:00
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
5f46ac2b01
Temporary fix that was breaking clicks inside of embedded pads
2012-01-15 18:24:18 +00:00
6b49a56e01
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-15 17:59:42 +00:00
e14fd22284
fix large left padding
2012-01-15 17:59:19 +00:00
1767e0f6e8
Update static/css/pad.css
2012-01-15 18:55:33 +01:00
960a79b77b
Added icon for ordered lists
2012-01-15 18:37:33 +01:00
f4dca37a93
Ordered list support
2012-01-15 17:20:20 +00:00
c45932c6b8
Merge pull request #329 from cweider/security
...
Security [HTML Escaping]
2012-01-14 15:22:12 -08:00
387dd4a48b
The value of all href attributes is escaped.
2012-01-14 14:50:23 -08:00
6e36b59a59
All escaping functions replace HTML reserved characters.
2012-01-14 14:46:15 -08:00
f08e68c8f9
Addition for 720px phones (forgot index.html)
2012-01-14 21:41:41 +01:00
30da7357e5
Merge pull request #326 from 0ip/fileinputfix
...
Fixed file input readability in Chrome
2012-01-14 07:24:34 -08:00
f9b0b10709
made 0ip images so that Pita likes them
2012-01-14 16:16:35 +01:00
42eee71295
Fixed file input readability in Chrome
2012-01-14 15:07:11 +01:00
8787897f60
Changed position values
2012-01-13 23:58:47 +01:00
20b63f1fa7
Merged and optimized icons
2012-01-13 23:58:01 +01:00
642b716553
Merge pull request #289 from jhollinger/no_spaces
...
Sanitize pad names
2012-01-08 07:30:07 -08:00
86902c2c0b
Merge pull request #291 from jhollinger/export_revisions
...
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
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
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
12fc8226f0
Made pad.html more valid
...
- & -> &
- Removed duplicate ID in one Tag
2012-01-08 13:55:34 +01:00
ca70a7772a
Fix cursor jump in IE when clicking edit buttons
2012-01-02 20:45:31 -05:00
9203ac2362
(1) Support for x*720px phones (like Galaxy Nexus) (2) Fix for user popup
2011-12-31 18:16:50 +01:00
2481c1cb4f
removed hackish code
2011-12-31 17:47:34 +01:00
a9a17e7360
properly disables line numbers on mobile devices (fix for #304 and #305 )
2011-12-31 17:46:10 +01:00
2a86d57e46
Add ability to export specific pad revisions
2011-12-18 00:18:35 -05:00
e8ef99fb72
Sanitize pad names
2011-12-16 15:41:11 -05:00
609701961e
Added some comments to help us documentating the code
2011-12-11 19:45:40 +01:00
d20dcc7c57
fixed merge conflicts
2011-12-11 18:45:41 +01:00
3401a7bc11
small css fix at the importexport panel
2011-12-11 18:20:05 +01:00
c72cd49ede
Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki
2011-12-11 18:09:51 +01:00
4287cc283a
Fix for disappearing chat
2011-12-07 15:14:52 +01:00
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
40c5e70aa7
Add DokuWiki export
2011-12-07 13:03:08 +01:00
a444f11900
Merge pull request #275 from 0ip/patch-5
...
Mobile Patch [New]
2011-12-06 12:10:59 -08:00
89aac09c91
sorry for that, correct pad.html
2011-12-06 18:54:57 +01:00
95fe749791
Optimized index page for mobile devices
2011-12-06 18:48:28 +01:00
a4dad594d3
Optimized css for mobile devices
2011-12-06 18:46:40 +01:00
b615da194f
Optimized index page for mobile devices
2011-12-06 18:45:16 +01:00
9ad3aa0e4b
Updated chat for mobile devices
2011-12-06 18:43:30 +01:00
2dbe562bdc
Fix for 'Fix IE8 userpicker color issue' :)
2011-12-06 18:18:38 +01:00
3b1765bb23
Defining minimum Height and Width of Serialbox
2011-12-05 11:53:43 -08:00
b2f1f04b54
Add support for hiding QR code via a parameter
2011-12-04 17:18:24 +01:00
990a559a09
When noColors is set hide the clearAuthorship colors button
2011-12-04 17:17:44 +01:00
a46a723b09
slight clean up
2011-12-04 17:17:16 +01:00
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
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
499e780c88
added related div to work properly
2011-12-02 20:39:23 +01:00
495b48056b
Minor bugfix: Solves http://j.mp/utOjbn
2011-12-02 20:36:02 +01:00
9e509677dc
Merge pull request #231 from jtlebi/origin/shift-tab
...
(de)indent behaviour enhancement
2011-11-28 20:23:37 -08:00
c8bfd21c03
Merge branch 'master' of https://github.com/Pita/etherpad-lite
2011-11-28 20:48:16 +00:00
769892a736
Show QR code on read only and non read only options
2011-11-28 20:45:27 +00:00
ec56ca75ad
Fixed #135 , thx to @Wikinaut
2011-11-28 11:26:36 -08:00
e5d12f1d56
cherry picking @Yaco-Sistemas commit to fix IE 8
2011-11-28 11:18:47 -08:00
a2d3c6ddb2
Merge branch 'master' of git://github.com/Pita/etherpad-lite
2011-11-28 11:16:33 -08:00
054af3da77
Change embe this pad to share and embed this pad
2011-11-28 02:42:30 +00:00
90d36471b1
Remove read only link and place all functionality into embed option sorts issue #246
2011-11-27 21:04:11 +00:00
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
5838e7ee7f
fixed merge conflicts
2011-11-27 11:55:18 -08:00
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
f465ebaab9
Being mentioned in a chat
2011-11-27 16:35:20 +00:00
9bfc78eac1
Applied 0ip's fix https://github.com/Pita/etherpad-lite/issues/233#issuecomment-2884908
2011-11-27 01:11:51 +00:00
33c51e1b01
Second and final part of https://github.com/Pita/etherpad-lite/issues/233
2011-11-26 19:16:32 +00:00
dd2d0d45f0
First part of https://github.com/Pita/etherpad-lite/issues/233
2011-11-26 19:15:43 +00:00
7296913cb0
fixed merge confilicts
2011-11-25 16:56:08 -08:00
54b912f352
Revert "This should fix the IE Cursor Issue #171"
...
This reverts commit 53bf7dc19d
2011-11-25 16:10:21 -08:00
dc6d0cda68
Merge branch 'master' of github.com:Pita/etherpad-lite
2011-11-25 16:08:24 -08:00
fa098d73cd
Do a reconnect on network problems. After 10s it gives up
2011-11-25 15:26:01 -08:00
7d184a681a
fix indenting while cursor is in the line
2011-11-26 00:02:25 +01:00
9c14dcd498
updated menu bar labels
2011-11-25 11:19:22 +01:00
caf8792974
applying/removing list now preserves the indentation level
2011-11-25 11:10:57 +01:00
ea2e7d0550
added support for (de)indent of regular text
2011-11-25 10:29:31 +01:00
6b11ae330d
added handling of de-indenting when already on higher level
2011-11-25 09:13:03 +01:00
40fcc83a05
Merge pull request #227 from jtlebi/origin/shift-tab
...
handle shift+tab, trivial fix
2011-11-24 08:04:04 -08:00
7a7b3391fb
add checkbox to limit number of inputs
2011-11-24 16:34:28 +01:00
42341f2b2f
handle shift+tab, trivial fix
2011-11-24 15:29:45 +01:00
ccaa21a04a
Styling for the new embed options
2011-11-23 15:49:22 +00:00
dedd604125
Add support for embedding read only etc.
2011-11-23 15:46:34 +00:00
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
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
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
53bf7dc19d
This should fix the IE Cursor Issue #171
2011-11-19 12:30:12 -08:00
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
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
fd056cf09c
Adapt client code for its use in the server
2011-11-17 10:26:23 +01:00
fa9b36df0f
Merge pull request #203 from andrehjr/issue187
...
Fix issue # 187 Pad forgets usernames often
2011-11-15 23:11:55 -08:00
8e7e74170e
Extract getUrlVars() function calls to a local var
2011-11-15 21:36:26 -02:00
ce4d9df665
Fix issue #182 : Pad forgets usernames
2011-11-15 21:33:43 -02:00
dac828e8f6
Update static/index.html
2011-11-13 14:32:21 +00:00
eecb45cbfd
Focus on input box onLoad
2011-11-12 18:30:38 +00:00
bf0fe9377d
Input fix for Wikinaut
2011-11-06 12:06:16 +00:00
1bfd0e4707
Allow authorship background colors to be disabled with a parameter
2011-09-04 13:48:53 +01:00
a107f080a8
fix username being set in querystrings
2011-09-02 12:56:51 -07:00
7b8d48467f
added proper embed parameter support, fixes #116
2011-08-23 18:36:38 +01:00
335643a860
ODT Import works but wasn't mentioned yet
2011-08-24 05:22:46 +03:00
fd97946619
fixed user drop down issue
2011-08-24 04:48:21 +03:00
913c3c455d
fixed merge conflicts
2011-08-22 13:14:59 +01:00
e771542961
added deleteGroup API function
2011-08-22 13:11:34 +01:00
a231ff45e1
fixed fileupload field in Firefox
2011-08-21 20:17:38 +01:00
177abdd29e
Don't show PDF Export on Windows
2011-08-21 20:09:25 +01:00
8c301d4fe8
remove star buttons on timeslider
2011-08-21 20:09:09 +01:00
4e592def7e
fixed color chooser
2011-08-21 19:27:02 +01:00
c1272ed566
Fixed minor German effort at English ;)
2011-08-21 19:21:23 +01:00
307d0acdeb
put expolorer canvas into minify
2011-08-21 19:20:18 +01:00
1df9d04e04
Fix for farbtastic in IE9, I had to recreate the file because the original commit was so messy
2011-08-21 19:08:19 +01:00
0b18e46bc3
keep the userlist open while editing
2011-08-21 19:07:35 +01:00
4f233d88f8
fixed the backward compatility to old colorIds
2011-08-21 18:53:30 +01:00
6c354c6333
improved the design of the user icon
2011-08-21 18:18:35 +01:00
070b5f16f7
added the default embed parameters to the embed code
2011-08-21 16:44:38 +01:00
82e4d7fe7d
Edited static/css/pad.css via GitHub
2011-08-21 09:45:05 +03:00
42662d73d0
Merge branch 'master' of /home/jose/etherpad-lite/
2011-08-20 18:23:58 +01:00
9d37d91ce1
added a colorPicker
2011-08-20 18:22:10 +01:00
8214e132b7
Merge branch 'patch-6' of git://github.com/0ip/etherpad-lite
2011-08-18 21:05:44 +01:00
71c6e494d5
fixed the buttons, the now fully clickable (someone has to test that with IE)
2011-08-18 12:16:00 +01:00
cb23b140d6
Merge pull request #87 from 0ip/patch-1
...
Redesigned start page
2011-08-17 12:27:17 -07:00
b02ee510ac
Merge branch 'patch-3' of https://github.com/0ip/etherpad-lite
2011-08-17 19:58:37 +01:00
d3a33024ec
reverted js functions but reduced if clause using ternary operation
2011-08-17 21:58:07 +03:00
c8a0f946f2
Merge branch 'patch-4' of https://github.com/0ip/etherpad-lite
2011-08-17 19:43:39 +01:00
c7f3b3d9ec
Merge branch 'patch-2' of https://github.com/0ip/etherpad-lite
2011-08-17 19:36:56 +01:00
c2457e06d8
send client side javascript errors to the server
2011-08-17 19:24:44 +01:00
84f1baf972
fixed a small css bug at the disconnect message
2011-08-17 18:11:36 +01:00
58ea0d0ed3
changed .gif to .png
2011-08-17 19:14:43 +03:00
06037dcb8e
added transparent icons
2011-08-16 22:59:17 +02:00
d4b713d236
colorized the return link and removed some odd stuff
2011-08-16 23:49:52 +03:00
ac0dff0c2c
height @ #editbar ul is redundant && removed some space
2011-08-16 23:44:43 +03:00
6f7a9ce77a
Redesigned pad editbar + chatbox (bg color)
2011-08-16 23:40:07 +03:00
47a16ddbe2
QR code support (js)
2011-08-16 23:34:05 +03:00
6d47a00f29
QR code support (html)
2011-08-16 23:31:41 +03:00
5d30c8b4a5
Peter will hate this but I extended Etherpad to support 64 colors and removed the requirements for a background image on the colorpicker dialogue
2011-08-16 21:29:51 +01:00
4aeb76cdac
Reworked the start page (brighter, added top bar, font on Windows sharper), fixed some padding bugs (firefox) and compressed the js
2011-08-16 23:25:42 +03:00
d2c502e2be
added deletePad API function
2011-08-16 20:02:30 +01:00
3ff34f50d1
added a security control at socketiorouter, pad security is now fully enforced
2011-08-16 15:53:09 +01:00
48980f9e19
Show permission messages on the browser side
2011-08-15 18:27:11 +01:00
255dc5a325
fixed merge conflicts
2011-08-15 16:58:22 +01:00
7d1dbae5e5
Add pad.css and custom/pad.css availability into the iFrame as a fix for issue 83
2011-08-15 15:49:09 +01:00
37224f620f
Fix issue 82, bullets not showing up in time slider, please note that the timeslider may have other css bugs such as indent etc and this needs testing
2011-08-15 15:48:49 +01:00
37a220fa87
fixed opera bug thx @johnyma22
2011-08-15 15:45:28 +01:00
b300dc1d2c
fixed merge conflicts
2011-08-13 22:18:42 +01:00
db3ee19ced
Added support for monospace font to be passed as a parameter in the URL
2011-08-13 22:10:58 +01:00
d0e378f63a
added a security manager to control pad access on group pads
2011-08-13 22:07:21 +01:00
4b77dd8c7a
Beginning of a show chat history function
2011-08-13 21:59:12 +01:00
bba9cd515b
Added support for changing username from the URL ie ?userName=JohnMcLear -- doesnt urldecode etc. needs checking for vulnerabilities too
2011-08-13 19:53:02 +01:00
7f28889660
Removed my cake commit that I used as a placemarker
2011-08-13 18:38:00 +01:00
8db0c12bbe
Add support for removing line numbers using the jQuery API and stopped it publishing that change back if the param is set
2011-08-13 18:37:44 +01:00
fb593c1d5c
Began adding support for passing parameters via the URL and removed a location redirect that was no longer needed
2011-08-12 16:00:09 +01:00
0e05e58c76
changed copyright from Peter 'Pita' Martischka to Peter 'Pita' Martischka (Primary Technology Ltd)
2011-08-11 15:27:16 +01:00
38801fa3b2
added a ugly favicon, to motivate people creating a better one ;)
2011-08-11 15:16:26 +01:00
9cc3b543cc
Merge branch 'master' of git://github.com/Pita/etherpad-lite into api
2011-08-10 22:47:50 +01:00
ce1012438e
added setPublicStatus, getPublicStatus, setPassword and isPasswordProtected
2011-08-10 22:44:16 +01:00
dc15682a27
changed name of getMapped*4 functions to create*IfNotExistsFor
2011-08-10 22:43:38 +01:00
578f8db311
improved test.html
2011-08-10 22:43:29 +01:00
9f530962ee
Add js tests to assist with api development
2011-08-10 22:43:20 +01:00
3c46cce341
some small design changes
2011-08-10 18:26:12 +01:00
13c10013b9
do the chat resize without hiding the pad text
2011-08-10 18:18:50 +01:00
d812557445
fixed #73
2011-08-10 18:06:22 +01:00
33ec98dd35
beauty
2011-08-10 17:24:59 +01:00
c4ac1babe8
removed unused images
2011-08-10 17:23:38 +01:00
ba9861382e
fixed the design
2011-08-10 17:19:23 +01:00
d66675914c
Merge branch 'newDesignTest' of /home/jose/etherpad-lite.io/ into johnslayout
2011-08-10 16:19:02 +01:00
1a824bd130
Merge branch 'master' of .git into api
2011-08-09 11:08:27 +01:00
178b4a95ec
added getMappedGroup4 and createGroup
2011-08-08 16:21:31 +01:00
15bf4b9313
Edited static/index.html via GitHub
2011-08-02 15:06:09 +03:00
17472a7270
Removed unnecessary comments, changed label class to id and moved the custom js to the appropriate place
2011-08-02 14:56:55 +03:00
143369b387
Merge branch 'master' of git://github.com/Pita/etherpad-lite into newDesignTest
2011-08-01 23:13:51 +01:00
ab2c8fadf1
Fix button alignment issues making the butotns prettier after I made them 1px out in places
2011-08-01 20:01:41 +01:00
9911fb95b9
fixed merge confilcts in pad.html
2011-08-01 13:20:05 +01:00
053e48c3f4
Secure the call of the costumStart function
...
Author: Peter 'Pita' Martischka <petermartischka@googlemail.com>
2011-08-01 12:09:33 +01:00
03192c1b9a
Fix the styling of the chat vdraggie
2011-07-31 20:16:59 +01:00
4d4773c1f3
Fix CSS and HTML bugs with new sprites
2011-07-31 20:07:18 +01:00
1d62de9acf
Updated CSS for sprites
2011-07-31 19:41:54 +01:00
92377613d7
First version of working sprites -- Still some work to do such as changing export icons to use the latest .gif but this is good start
2011-07-31 19:41:42 +01:00
8101b7df92
Changed the gitignore so everything exept the template files are ignored
2011-07-31 19:39:14 +01:00
c8d89e9147
added some forgotten ids
2011-07-31 19:32:35 +01:00
d4ffbdcc1c
Add a new class for buttonicon which specifies the new backghround image, this is part of the single image thing Peter wants to reduce the number of images we need
2011-07-31 19:11:55 +01:00
7b69f3d7ed
New icons file, updated timeslider and resize image
2011-07-31 19:08:14 +01:00
3a4c0ea254
Remvoed maximize button -- I never liked this..
2011-07-31 18:53:03 +01:00
20bb067743
removed old background image
2011-07-31 18:52:35 +01:00
16c9bf6130
removed old pad top image that is no logner used
2011-07-31 18:52:17 +01:00
de32503f8e
improve including of custom js/css
2011-07-31 17:21:01 +01:00
bcaadfa6eb
Ensure the browser doesn't send socket.io message with the browser version
2011-07-31 16:13:56 +01:00
aa5b1b85ae
fixed all random string functions
2011-07-31 11:48:06 +01:00
64b4ff3fb1
poor Y and j... :)
2011-07-31 01:58:46 +03:00
a47b5ab458
added the ability to add costum js/css
2011-07-30 16:33:35 +01:00
115f7d6b51
Fixed the iframe problems
2011-07-27 15:11:30 +01:00
e96595896c
Fixed wordle export under https
2011-07-27 13:35:22 +01:00
6867d881b1
Hide import/export options that are not avaiable if abiword isn't configured
2011-07-26 18:54:42 +01:00
0d46d6f050
Merge git://github.com/0ip/etherpad-lite into newDesignTest
2011-07-26 18:15:18 +01:00
1e54c41f60
Edited static/index.html via GitHub
2011-07-26 20:14:01 +03:00
87d24238a8
Merge git://github.com/0ip/etherpad-lite into newDesignTest
2011-07-26 18:10:38 +01:00
6e2f3a5f7f
Merge /home/jose/etherpad-lite.io/ into newDesignTest
2011-07-26 18:08:43 +01:00
1a43731a06
Ops, looks like I broke the wordle export at some point, now I fixed it
2011-07-26 18:02:23 +01:00
56ab112fa3
Timeslider Javascript is now minified too
2011-07-26 17:39:25 +01:00
3c493b2f50
Fix for IE erroring on chat window close
2011-07-26 17:35:00 +01:00
b987a23cd0
Edited static/index.html via GitHub
2011-07-26 19:32:41 +03:00
00824ae2d7
Ops, fixed a small bug at the timeslider
2011-07-26 16:46:28 +01:00
Peter 'Pita' Martischka