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
John McLear
30e644ee0f
Merge pull request #372 from cweider/button-styling
...
Shift button styling specifics into CSS.
2012-01-29 07:15:51 -08: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
Jordan
01cacff008
Convert goToPad to middleware
2012-01-28 21:51:25 -05: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
booo
ebf39ba2a8
Merge branch 'master' of https://github.com/Pita/etherpad-lite
2012-01-28 18:33:08 +01:00
John McLear
3ca5a0877b
Merge pull request #370 from 0ip/patch-3
...
abc
2012-01-28 08:55:51 -08:00
0ip
41dea6f591
abc
2012-01-28 17:53:55 +01:00
John McLear
364aab2dfa
Merge pull request #369 from 0ip/popup_label_fix_2
...
Added missing labels
2012-01-28 08:46:41 -08:00
Robin
d872b42e31
reverted John's commits, added labels and tweaked popups to act more dynamically
2012-01-28 17:38:52 +01:00
booo
a300bb6e92
move randomString function into module
2012-01-28 13:24:58 +01:00
Peter 'Pita' Martischka
158fd6c281
Merge pull request #365 from booo/master
...
update log4js version
2012-01-28 04:03:28 -08:00
booo
f7089bba20
package.json: update log4js version (0.4.1)
2012-01-28 12:55:11 +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
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
