6da6a7f0d8
Use nice editbar popups for connection status instead of srceen-blocking modals.
2012-07-13 08:23:22 +02:00
7653db36fe
Revert "option to stop autoscroll"
...
This reverts commit 6726ea6632
2012-07-12 10:23:55 +02:00
6726ea6632
option to stop autoscroll
2012-07-11 17:42:59 +01:00
e4ff4021ab
Merge pull request #810 from redhog/aceEditEvent
...
Plugin/hook features&bugfixes
2012-06-22 03:53:50 -07:00
48daf83a30
#763 : Use spaces instead of tabs
2012-06-13 13:56:09 +03:00
2cbe29eb45
Fix pad.js' customStart.
...
Appears that sourcing of static/custom/pad.js was removed from
templates/pad.html. This prevented static/custom/pad.js:customStart
from running. Add it back to get customStart working again.
2012-06-12 14:20:54 -07:00
3338db9485
Bugfixes
2012-06-05 13:32:33 +02:00
cf2f0b72a3
More plugin information
2012-06-04 14:33:38 +02:00
ad68a6e3bf
Bugfix for Chads new toolbar styling
2012-05-30 17:41:43 +02:00
15a7d24450
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
...
Conflicts:
src/node/handler/PadMessageHandler.js
src/static/css/pad.css
src/templates/pad.html
2012-05-29 21:26:12 +02:00
7f9bfd6b26
Add comments to templates.
2012-05-28 15:14:52 -07:00
96ab3dc3b4
jQuery is packaged - this is pure duplication.
2012-05-28 15:14:52 -07:00
d5ac2bfb71
Explicitly require jQuery before using it.
2012-05-28 15:14:52 -07:00
595fc5710e
Add ace2_common to bottom of the page includes.
2012-05-28 15:14:52 -07:00
9c6731f3b8
No comet required on landing page
2012-05-22 21:30:50 +02:00
caa56dd32a
Add non-floating popups
2012-05-20 15:59:51 +02:00
205797cd83
Remove class duplicate
2012-05-20 15:35:41 +02:00
fbee7dabcf
Add grouped buttons
2012-05-20 15:29:10 +02:00
0d68cd23ba
Remove old CSS code
2012-05-20 14:48:02 +02:00
fbc2cb32b3
Merge pull request #705 from johnyma22/removeWordle
...
Remove wordle
2012-05-19 05:58:38 -07:00
53bfc380af
Merge pull request #703 from cweider/remove-onclick
...
Remove onclick
2012-05-19 05:41:49 -07:00
9f46678e5d
Bugfix for IE and document.domain
2012-05-18 18:57:18 +02:00
fc946ffc33
Hide editing buttons when in readonly mode
2012-05-17 12:03:38 +02:00
d65092e067
Move id, '*link' to the link.
2012-05-14 17:11:05 -07:00
1ea889bfab
Anchors are not icons
2012-05-13 15:33:22 -07:00
2a3fce0cf1
The showusers control is an anchor.
2012-05-13 15:33:22 -07:00
dc0fb12b09
Remove onclick attributes from editbar.
2012-05-13 15:33:22 -07:00
def904dbed
remove wordle
2012-05-13 20:20:18 +01:00
47a257ff72
accidentally deleted an end block in last merge
2012-05-01 12:02:12 +02:00
1329e93639
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
...
Conflicts:
src/templates/pad.html
2012-05-01 11:35:06 +02:00
64db697558
Fixed typos
2012-04-30 16:54:19 +02:00
23cdb2a5c6
Removed QR-Code
2012-04-30 15:54:21 +02:00
cf54c23228
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
...
Resolved conflicts:
src/templates/pad.html
2012-04-30 15:17:23 +02:00
a73192b10d
Merge pull request #680 from fourplusone/fix/fix-677
...
Fix #677
2012-04-29 10:57:35 -07:00
0e941b498e
fix #677
2012-04-29 19:54:38 +02:00
f6bdbddfcc
Merge pull request #679 from 0ip/highl_mod
...
Tidy up wobbly button highlighting code
2012-04-29 08:10:52 -07:00
4b272fe2e1
Tidied up highlighting for currently opened module
2012-04-29 01:00:31 +02:00
c11df112e8
templates/plugins.html Fixed relative paths
2012-04-28 22:00:15 +02:00
c173ebe197
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
2012-04-25 17:51:03 +02:00
513deef768
added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670
2012-04-25 10:23:58 +02:00
ed7e254417
Disconnect handling and cleanup of unused code
2012-04-23 14:47:07 +02:00
9fe8a7530d
Merge pull request #641 from 0ip/highlight_module
...
Fix | Highlight currently opened module
2012-04-19 08:23:51 -07:00
31909f6e60
Added viewport
2012-04-19 17:04:44 +02:00
ef88d2798e
Restore overwritten plugin manager UI
2012-04-19 17:00:29 +02:00
7ab7ee9f5e
Plugin admin fixes
2012-04-17 22:40:53 +02:00
6f774bc6a5
Separated out the code for the plugin manager
2012-04-17 22:40:46 +02:00
f80f9fc59f
Merge commit 'd5120c9' into pita
2012-04-17 22:34:45 +02:00
3e47300587
template/pad.html removed id duplicates, moved revision button, converted TABS to spaces
2012-04-16 15:19:53 +02:00
9cbb897c45
template/pad.html removed some whitespace
2012-04-16 15:13:07 +02:00
f4be70c45e
add more blocks to pad.html
...
... to allow plugins to be more flexible extending etherpad
2012-04-12 20:24:38 +02:00
8fa54e2402
admin interface styling and sensibility
2012-04-11 19:44:18 +02:00
b767192c58
Revert "Made it possible to disable minification again"
...
This reverts commit 22eaa6ffc0
2012-04-11 02:08:50 -07:00
7766f8aaad
Merge pull request #591 from fourplusone/timeslider_authors
...
Timeslider authors
2012-04-05 16:38:55 -07:00
151f1a0d71
Merge branch 'develop' into timeslider_authors
2012-04-05 21:54:26 +02:00
9e042ee942
Merge branch 'develop' into timeslider_authors
...
Conflicts:
src/static/css/pad.css
src/templates/timeslider.html
2012-04-05 21:47:59 +02:00
a3c9407ed6
Merge branch 'develop' of git://github.com/Pita/etherpad-lite
2012-04-05 20:14:48 +02:00
d5120c98d0
very quick admin interface styling and sensibility
2012-04-05 18:22:53 +01:00
66fdacf9cf
move css out of html
2012-04-05 18:04:17 +01:00
28aeb24f86
add some sense to the buttons on the plugin page
2012-04-05 18:00:38 +01:00
4325f0b907
Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff
2012-04-05 01:45:14 +02:00
08cc3e128f
Bugfix for timeslider styling
2012-04-01 14:33:39 +02:00
33c53e61c2
Merge branch 'johnyma22'
...
Conflicts:
node/utils/Minify.js
src/static/js/pad.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_savedrevs.js
static/css/timeslider.css
static/pad.html
2012-04-01 13:27:38 +02:00
b74447aa3c
Styling generalization - use classes instead of id:s where applicable
2012-03-28 19:20:07 +02:00
22eaa6ffc0
Made it possible to disable minification again
2012-03-22 18:35:06 +01:00
50474dff1f
Some new blocks to allow plugins to add scripts, styles and modals
2012-03-21 19:29:06 +01:00
1ca12b24e6
Bugfixes for plugin installer
2012-03-21 19:28:39 +01:00
c591efb352
Plugin list can now be reloaded 'live'
2012-03-19 17:16:49 +01:00
af96509fbb
Plugin install/uninstall
2012-03-17 18:17:10 +01:00
81250cba15
Searching for plugins, plus handling async events from the server (progress)
2012-03-15 21:07:48 +01:00
51cae02e9d
Show installed plugins and search new ones
2012-03-15 18:25:06 +01:00
a5366a0a16
Integrated hooks into templates and provided a blokc/hook for the left and right editbar menu
2012-03-13 20:32:56 +01:00
05c2e0fde5
Made all html pages into eejs templates
2012-03-13 18:24:45 +01:00
Marcel Klehr