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

934 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
7a726f86ec Merge pull request #362 from 0ip/nf 
reworked pad.html, added settings menu, sticky chat, ...  Some minor bugs I will sort later tonight..  mostly UI stuff.  Merging for now to allow people to start building other items into settings menu
 2012-01-26 14:20:03 -08: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
d370a5b76f Improved npm and node version checks 2012-01-26 12:55:54 +01:00
Peter 'Pita' Martischka
9f9eb6e928 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-26 12:40:23 +01:00
Peter 'Pita' Martischka
a408a2d43b Merge pull request #359 from booo/master 
close issue #281?
 2012-01-25 13:58:03 -08:00
booo
87b11045e1 fix issue #281? 2012-01-25 22:00:08 +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
John McLear
92e1ed80b5 Merge pull request #354 from cnelsonsic/patch-1 
Changing openssl dev package name for Fedora to what it actually is.
 2012-01-24 17:49:31 -08:00
C Nelson
b15b7fe4bd Changing openssl dev package name for Fedora to what it actually is. 2012-01-24 18:52:09 -06:00
Marcel Klehr
228543a30e Text color changes based on author color 2012-01-23 18:40:54 +01:00
Peter 'Pita' Martischka
947d53e231 Merge pull request #343 from cweider/modulize 
Modulize
 2012-01-22 10:22:40 -08:00
Peter 'Pita' Martischka
351b516359 Merge pull request #344 from cweider/misc-fixins 
Miscellaneous Fixes
 2012-01-22 10:22:23 -08: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
71dfced06d Provide filename to isolation function. 2012-01-22 09:49:13 -08:00
Chad Weider
8bf0e7c2aa Allow dashes in included file names. 2012-01-22 09:49:13 -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
8a0d6c6636 Add missing dependency for timeslider.js. 
When dependencies are made explicity `pad_savedrevs.js` will be required by several of the `pad_*.js`.
 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
fc68a25b21 Isolate all files in a closure. 2012-01-22 09:49:13 -08:00
Chad Weider
ab02135643 Factor out taring process. 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
Chad Weider
b175ad562a Use uncompressed jQuery. 
The jQuery library does not need to be compressed; it is compressed as a consequence of being included in `pad.js`.
 2012-01-22 09:46:08 -08:00
Chad Weider
53549b7422 Use constants and CWD-independent paths for resource directories. 2012-01-22 09:42:09 -08:00
Chad Weider
c3acdbe329 Minify uses the stardard middleware interface. 2012-01-22 09:33:17 -08:00
Chad Weider
1c0a74d7c6 Use middleware to specify Server name in header. 2012-01-22 09:30:51 -08:00
John McLear
04d48e8592 Added a getting started developing Etherpad Lite video to readme.md.. 2012-01-22 16:29:51 +00:00
John McLear
ca68196c32 Added a getting started developing Etherpad Lite video to readme.md 2012-01-22 16:24:06 +00:00
Peter 'Pita' Martischka
7a3e800fca Merge branch 'master' of git://github.com/marcelklehr/etherpad-lite 2012-01-22 15:41:24 +01:00
Peter 'Pita' Martischka
cf47153769 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 15:25:50 +01:00
Peter 'Pita' Martischka
165f26947d Merge pull request #341 from azul/race_condition 
make PadMessageHandler more robust against timing issues
 2012-01-22 06:25:35 -08:00
Peter 'Pita' Martischka
cece2c858e Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 15:24:02 +01:00
Peter 'Pita' Martischka
d391dab558 fixed merge conflict 2012-01-22 15:23:50 +01:00
Peter 'Pita' Martischka
6b19ffeaf6 Merge pull request #348 from 0ip/fixforfixforfix 
Final fix for fix for fix (scope issues)
 2012-01-22 06:22:46 -08:00
Peter 'Pita' Martischka
e2a348057d Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 14:58:38 +01:00
booo
7720c312ca README: add notice about jshint 2012-01-22 21:57:44 +08:00
Peter 'Pita' Martischka
ada09f3e6b Added a jshint binary 2012-01-22 14:56:08 +01:00
Marcel Klehr
49061175c9 Text color changes based on author color 2012-01-22 13:30:25 +01:00