libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
869 commits 2 branches 0 tags 24 MiB
Commit graph

438 commits

Author SHA1 Message Date
Peter 'Pita' Martischka
4d714cee94 Merge pull request #371 from cweider/page-initialization 
Page initialization
 2012-01-30 01:56:02 -08:00
John McLear
7096ce7f1e Fix #171 IE9 edit issue and #361 IE URL Last Letter issue 2012-01-29 18:41:33 +00:00
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
Robin
62acab961f added missing class for settings button 2012-01-29 17:03:33 +01:00
Robin
ddcaf0dad6 Moved inline css to pad.css and made popups even more dynamic 2012-01-29 16:57:06 +01:00
Chad Weider
a408557a0e Make implicit loading of modules unnecessary. 
This is one step on the way to simplifying `Minify` and allowing all of the modules within pad.js to be loaded independently in development mode (which is useful for debugging).
 2012-01-28 23:11:54 -08:00
Chad Weider
6a4c025e08 Global exception handler is not registered until the page's controller adds it. 
It is bad form to register this handler on definition. This would cause problems if, for instance, this module was required by our Node code.
 2012-01-28 22:35:38 -08:00
Chad Weider
c12e1aff07 Place script at bottom. 2012-01-28 18:42:50 -08:00
Chad Weider
67e6f9fa5a Move timeslider code into JS. 2012-01-28 18:42:49 -08:00
Chad Weider
d934fd6107 Remove all global dependencies from broadcast modules. 2012-01-28 18:40:56 -08:00
Chad Weider
bdf0f203f9 Shift button styling specifics into CSS. 2012-01-28 15:12:21 -08:00
Chad Weider
cd86ef5600 Shift pad initialization into JavaScript. 2012-01-28 14:48:53 -08:00
Chad Weider
3e9b56aa75 Give controller for pad.html a more appropriate name. 2012-01-28 14:48:53 -08:00
Chad Weider
514698162f Inject pad dependencies into most pad submodules. 2012-01-28 14:48:53 -08:00
Chad Weider
56c07e484a Expose settings on pad object. 2012-01-28 14:48:53 -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
0ip
41dea6f591 abc 2012-01-28 17:53:55 +01: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
2a6e4ba194 Fix tiny css bug and make warning text not selectable 2012-01-27 01:02:12 +00: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
1b89e7e290 Implement require in HTML pages. 2012-01-22 09:49:13 -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
da95016228 Add a fake require to go with the fake exports. 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