622068183a
Revert "Text color changes based on author color"
...
This reverts commit 49061175c9
2012-01-26 12:57:57 +01:00
9f9eb6e928
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-26 12:40:23 +01:00
917732422d
fix minor bug where chat would overlay document scroll bar and also ensure rounded edges
2012-01-25 19:06:41 +00:00
7b77f3d4b5
Toggle sticky chatf unction can be called very easily, 0ip to add to settings interface
2012-01-25 19:03:25 +00:00
228543a30e
Text color changes based on author color
2012-01-23 18:40:54 +01:00
9253f9993d
Remove guards surrounding export steps.
2012-01-22 09:54:28 -08:00
62e0a8f26c
Use require-kernel for require functionality.
2012-01-22 09:54:28 -08:00
1b89e7e290
Implement `require` in HTML pages.
2012-01-22 09:49:13 -08:00
86f31c752d
Implement `require` for for plugin module.
2012-01-22 09:49:13 -08:00
fa2a6e9ee6
Implement `require` of dependencies for all `pad_*` modules.
...
Create a lazily-defined local reference for pad on initialization in each pad module in order to avoid circular dependency. At some point in the future this dependency should instead be injected into each module on initialization.
2012-01-22 09:49:13 -08:00
7f98116a43
Implement `require` for most modules.
2012-01-22 09:49:13 -08:00
72d29b1c62
Inject the pad dependency into chat.
2012-01-22 09:49:13 -08:00
da95016228
Add a fake `require` to go with the fake `exports`.
2012-01-22 09:49:13 -08:00
9e16b9a575
Always use the JS assets processed by Minify.
...
This allows the preprocessing that will restrict scope of files to be done once in Minify.
2012-01-22 09:49:13 -08:00
2b5d7a0048
All files export their public interface if `exports` is available.
2012-01-22 09:48:21 -08:00
003c2a59aa
Remove dependency on a global socket and address `pad.socket` instead.
2012-01-22 09:46:09 -08:00
6bbc32a19f
Default plugin should not fail if clientVars is not defined.
...
In the case that it is not defined, the configuration is `undefined`.
2012-01-22 09:46:09 -08:00
0f7e6feda1
Remove individual settings in `pad2.js` from global.
2012-01-22 09:46:09 -08:00
50d304022d
Change calculation of `userAgent`.
...
Default to 'node-js' only if no user agent can be found the normal way.
2012-01-22 09:46:09 -08:00
548c527aaf
Move exposure of `Ace2Editor` closer to the code that requires it.
2012-01-22 09:46:08 -08:00
7a3e800fca
Merge branch 'master' of git://github.com/marcelklehr/etherpad-lite
2012-01-22 15:41:24 +01:00
49061175c9
Text color changes based on author color
2012-01-22 13:30:25 +01:00
c0a0687fe9
It was definetely too late
2012-01-22 13:09:10 +01:00
3f8b03a900
Typo again
2012-01-22 02:15:02 +01:00
3c85a9cc6c
Typo
2012-01-22 00:13:00 +01:00
300886da34
Removed duplicates
2012-01-22 00:10:06 +01:00
9f0ca7cc44
Remove alt key from Z to stop Polish people feeling sad
2012-01-17 16:50:35 +00:00
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
Peter 'Pita' Martischka