a300bb6e92
move randomString function into module
2012-01-28 13:24:58 +01:00
158fd6c281
Merge pull request #365 from booo/master
...
update log4js version
2012-01-28 04:03:28 -08:00
f7089bba20
package.json: update log4js version (0.4.1)
2012-01-28 12:55:11 +01:00
2a6e4ba194
Fix tiny css bug and make warning text not selectable
2012-01-27 01:02:12 +00:00
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
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
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
57075d1545
Beautified html, sticky chat, dynamic inputs, beautified qr-code, fixed chat bug
2012-01-26 17:22:44 +01:00
622068183a
Revert "Text color changes based on author color"
...
This reverts commit 49061175c9
2012-01-26 12:57:57 +01:00
d370a5b76f
Improved npm and node version checks
2012-01-26 12:55:54 +01:00
9f9eb6e928
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-26 12:40:23 +01:00
a408a2d43b
Merge pull request #359 from booo/master
...
close issue #281 ?
2012-01-25 13:58:03 -08:00
87b11045e1
fix issue #281 ?
2012-01-25 22:00:08 +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
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
b15b7fe4bd
Changing openssl dev package name for Fedora to what it actually is.
2012-01-24 18:52:09 -06:00
228543a30e
Text color changes based on author color
2012-01-23 18:40:54 +01:00
947d53e231
Merge pull request #343 from cweider/modulize
...
Modulize
2012-01-22 10:22:40 -08:00
351b516359
Merge pull request #344 from cweider/misc-fixins
...
Miscellaneous Fixes
2012-01-22 10:22:23 -08: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
71dfced06d
Provide filename to isolation function.
2012-01-22 09:49:13 -08:00
8bf0e7c2aa
Allow dashes in included file names.
2012-01-22 09:49:13 -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
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
da95016228
Add a fake `require` to go with the fake `exports`.
2012-01-22 09:49:13 -08:00
fc68a25b21
Isolate all files in a closure.
2012-01-22 09:49:13 -08:00
ab02135643
Factor out taring process.
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
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
53549b7422
Use constants and CWD-independent paths for resource directories.
2012-01-22 09:42:09 -08:00
c3acdbe329
Minify uses the stardard middleware interface.
2012-01-22 09:33:17 -08:00
1c0a74d7c6
Use middleware to specify Server name in header.
2012-01-22 09:30:51 -08:00
04d48e8592
Added a getting started developing Etherpad Lite video to readme.md..
2012-01-22 16:29:51 +00:00
ca68196c32
Added a getting started developing Etherpad Lite video to readme.md
2012-01-22 16:24:06 +00:00
7a3e800fca
Merge branch 'master' of git://github.com/marcelklehr/etherpad-lite
2012-01-22 15:41:24 +01:00
cf47153769
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-22 15:25:50 +01:00
165f26947d
Merge pull request #341 from azul/race_condition
...
make PadMessageHandler more robust against timing issues
2012-01-22 06:25:35 -08:00
cece2c858e
Merge branch 'master' of github.com:Pita/etherpad-lite
2012-01-22 15:24:02 +01:00
booo