John McLear
3287a0000a
Merge pull request #349 from marcelklehr/master
...
Make text color change depending on luminosity of author color
2012-01-29 08:39:54 -08:00
John McLear
e68643b67e
Comment out some of the sidebar code that is no longer used and add a cookie set and get for sticky chat view
2012-01-28 22:24:14 +00:00
Robin
d872b42e31
reverted John's commits, added labels and tweaked popups to act more dynamically
2012-01-28 17:38:52 +01:00
John McLear
a53de45b32
Beautifying 0ips commit to give settings option, also add warning prior to altering everyones view and moved everyones view stuff into my view only that needed to be moved..
2012-01-27 01:00:14 +00:00
John McLear
47ee0ec383
Fix minor styling isue where focus chat box would try to show up even if chat was stuck to screen
2012-01-27 00:43:00 +00:00
Robin
57075d1545
Beautified html, sticky chat, dynamic inputs, beautified qr-code, fixed chat bug
2012-01-26 17:22:44 +01:00
Peter 'Pita' Martischka
622068183a
Revert "Text color changes based on author color"
...
This reverts commit 49061175c9
2012-01-26 12:57:57 +01:00
Peter 'Pita' Martischka
9f9eb6e928
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-26 12:40:23 +01:00
John McLear
917732422d
fix minor bug where chat would overlay document scroll bar and also ensure rounded edges
2012-01-25 19:06:41 +00:00
John McLear
7b77f3d4b5
Toggle sticky chatf unction can be called very easily, 0ip to add to settings interface
2012-01-25 19:03:25 +00:00
Marcel Klehr
228543a30e
Text color changes based on author color
2012-01-23 18:40:54 +01:00
Chad Weider
9253f9993d
Remove guards surrounding export steps.
2012-01-22 09:54:28 -08:00
Chad Weider
62e0a8f26c
Use require-kernel for require functionality.
2012-01-22 09:54:28 -08:00
Chad Weider
86f31c752d
Implement require for for plugin module.
2012-01-22 09:49:13 -08:00
Chad Weider
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
Chad Weider
7f98116a43
Implement require for most modules.
2012-01-22 09:49:13 -08:00
Chad Weider
72d29b1c62
Inject the pad dependency into chat.
2012-01-22 09:49:13 -08:00
Chad Weider
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
Chad Weider
2b5d7a0048
All files export their public interface if exports is available.
2012-01-22 09:48:21 -08:00
Chad Weider
003c2a59aa
Remove dependency on a global socket and address pad.socket instead.
2012-01-22 09:46:09 -08:00
Chad Weider
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
Chad Weider
0f7e6feda1
Remove individual settings in pad2.js from global.
2012-01-22 09:46:09 -08:00
Chad Weider
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
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
f4dca37a93
Ordered list support
2012-01-15 17:20:20 +00: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
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
Jordan
ca70a7772a
Fix cursor jump in IE when clicking edit buttons
2012-01-02 20:45:31 -05: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
