3e793b8a63
[/admin/plugins] remove progress history
2013-01-24 23:00:56 +01:00
fa55cd4759
[/admin/plugins] Add real-time on keypress search
...
also, I reduced the size of the activity indicator
2013-01-24 22:39:52 +01:00
1f7140345a
index wrapper block
2013-01-24 20:03:07 +00:00
7c06dc750c
Unify admin page titles
2013-01-24 18:46:32 +01:00
2eccaa2afd
Add a uniform menu to all admin pages
2013-01-24 18:46:15 +01:00
9129c6970a
add a html block eejs so you can add a cache manifest
2013-01-23 02:46:57 +00:00
b76f084f3a
add eejs block for disconnect
2013-01-23 01:01:35 +00:00
9c364d7d38
Added a template block for #users
2013-01-20 13:56:51 +01:00
1e7bcdba59
more sensible timeslider blocks..
2013-01-14 03:42:09 +00:00
33e0ec2097
Merge pull request #1334 from mluto/load-more-chat-messages
...
Load more than 100 chat messages using a 'load more'-link
2013-01-13 10:31:45 -08:00
0bcfef5aa4
Merge pull request #1352 from ether/timeslider-eejs
...
add a body eejs block to timeslider
2013-01-13 10:27:50 -08:00
eb0338d40c
better shindig
2013-01-13 18:23:35 +00:00
e137919c3d
add a body eejs block to timeslider
2013-01-12 23:51:35 +00:00
2786807f2f
Fix broken relative paths
...
Bug introduced in 53521c8732
2013-01-12 18:41:56 +01:00
bc05f9eb0a
converted load-more-link to button, added loading-gif, fixed typo
2013-01-07 19:15:55 +01:00
5f81daed0a
Added link to load more chat-messages using new GET_CHAT_MESSAGES
2013-01-07 17:36:03 +01:00
77315aa1d4
Load CSS before JS, in timeslider
2013-01-06 12:26:00 +01:00
c56c7b8ca9
Load CSS before JS
...
According to google this is more efficent
https://developers.google.com/speed/docs/best-practices/rtt?hl=en#PutSty
lesBeforeScripts
2013-01-06 12:19:56 +01:00
fdf6628cc5
Fix html attr translation
2012-12-23 18:17:23 +01:00
4a489f85f6
Fix translations in timeslider template
2012-12-23 18:17:08 +01:00
67c893aaca
Fix html10n and the locale resource <link>s
2012-12-23 18:16:39 +01:00
53521c8732
Replace webL10n with html10n.js
2012-12-23 18:16:13 +01:00
ff8b4b6b20
change key of message sucessfull on import
2012-12-09 17:34:32 +01:00
0371d5ba9e
Remove async load of l10n.js because Chrome fail to translate
2012-12-09 09:41:30 +01:00
b5af643969
Merge pull request #1259 from GuillaumeAmat/fixes/import-file-input-size
...
Reduce the file input's width in the import popup to prevent overflow
2012-12-05 06:14:05 -08:00
c853f8fad2
Reduces the width of the file input to prevent overflow in the import popup
2012-12-05 15:02:32 +01:00
fe89a367cc
Fix #1226 : Chrome would load async js
2012-12-05 14:16:44 +01:00
1fc5519c86
Display plugin versions
2012-12-04 14:30:30 +01:00
b3e55f64a8
stop password being clearly visible
2012-12-03 13:10:32 +00:00
bef25b40f8
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-03 11:37:01 +00:00
84d154b168
Update strings, add UK strings, fix JS
2012-12-03 11:35:06 +00:00
657322db91
fixed git merge confict
2012-12-03 01:39:59 +01:00
c9a5e55654
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:06:33 +00:00
3cdf66c2f7
first effort to move into templates but javascript is broken so dont pull
2012-12-02 17:03:56 +00:00
d761003588
fix path to favicon resolves #1236
2012-11-30 22:50:54 +00:00
d7cca602df
Added message translatable about features importing without abiword
2012-11-26 03:18:47 +01:00
6d5907562d
Fixed installed plugins section in plugins/info
2012-11-24 03:18:22 +01:00
8ac49477f9
Fix 1203: non-escaped html in plugins info
2012-11-24 00:42:44 +01:00
1e71797ad5
Replace Globalize with languages module
2012-11-20 19:46:17 +01:00
5baef07b55
Load l10n.js first but asynchronusly
2012-11-17 15:28:33 +01:00
716aa13a79
Fix examples url in settings.html to use ether/
2012-11-16 10:39:38 +01:00
68b1d78f32
Merge pull request #1159 from marcelklehr/fix/lang-autodetection
...
Fix language auto-detection
2012-11-14 10:58:07 -08:00
b416402f10
Fix language auto-detection
2012-11-14 19:38:35 +01:00
dcff0d74ef
Fix Timeslider translation not showing up
2012-11-14 19:31:09 +01:00
f5563ab704
Move locale detection to the client
...
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
2012-11-14 17:01:59 +01:00
ffb7cf47f2
Mate timslider page title translateable
2012-11-14 15:31:43 +01:00
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01:00
838a1e3d69
just export on timeslider, no import..
2012-11-14 09:31:27 +00:00
0e6a701f92
Update src/templates/timeslider.html
2012-11-14 09:20:16 +00:00
6de7634357
merged develop back in
2012-11-13 07:43:48 -08:00
4c095202bd
Merged branch feature/frontend-tests
2012-11-13 07:29:57 -08:00
19c12239f6
Simplify lang setting in pad.html template
2012-11-12 18:04:21 +01:00
ed3020c729
Translate timeslider export links
2012-11-12 17:34:29 +01:00
378a74fb4e
Remove translated strings from template files
2012-11-12 17:24:14 +01:00
7021a8b885
Add pad setting for UI lang
2012-11-12 16:49:15 +01:00
e5d1c6b279
Allow translation of pad.html
2012-11-10 14:13:10 +01:00
145e893273
Allow translations for index.html
2012-11-10 14:12:58 +01:00
f68bdde0c1
resolve #1131 make textarea resize
2012-11-06 11:56:19 +00:00
28bcdcec25
Merge pull request #1124 from Wikinaut/fix-issue-377-add-favicon-url-settings-parameter
...
fix #377 : add favicon url as optional settings.json parameter
2012-11-06 03:08:25 -08:00
6f1bab5faf
correct links to example settings.json files
2012-11-05 13:16:07 +00:00
b9541f938b
Merge pull request #1127 from Pita/admin-page
...
add express endpoint for admin index.html
2012-11-05 04:59:01 -08:00
3766858dd2
add express endpoint for admin index.html
2012-11-05 12:58:02 +00:00
b6a331b9ec
Merge pull request #1120 from Pita/feature/settings-admin
...
Modify Server Settings in /admin/settings
2012-11-05 04:48:59 -08:00
c92b5283fd
fix #377 : add favicon url as optional settings.json parameter
2012-11-04 11:26:17 +01:00
6408581adb
merged develop back in
2012-11-03 18:16:36 +00:00
1d055f2cd4
make stuff work
2012-11-02 15:15:13 +00:00
7fa5dd757e
remove cruft from js and move minify json to seperate file and also send emit back to server on save settings
2012-11-02 15:05:47 +00:00
f6fa897a4e
actually using text area is a lot less stupid
2012-11-02 14:31:52 +00:00
89e38ed4c2
Start putting file system together for admin settings, no where near complete
2012-11-02 13:16:15 +00:00
6d543fbcb3
Add a setting for customizing the app title
...
the app title is inserted into the <title> of all tepmlates
2012-11-02 12:30:57 +01:00
14ef06c699
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-30 17:22:08 +00:00
8d7a02816f
remove opacity to fix opera bug #941
2012-10-29 22:47:42 +00:00
4f04d14cab
Merge branch 'develop' of github.com:Pita/etherpad-lite into develop
2012-10-29 19:30:29 +00:00
0e41e9fdfc
allow max chat to be 999 chars
2012-10-29 19:29:30 +00:00
f59b643aa6
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-27 16:32:37 +01:00
2ecd5719fc
Merge pull request #1073 from Pita/librejs-header
...
Add LibreJS Licensing information to headers of HTML templates
2012-10-25 06:53:38 -07:00
a01768fc46
Merge pull request #1086 from neurolit/patch_relative_static_links
...
Templates: relative links instead of absolute ones for /static directory
2012-10-25 06:52:16 -07:00
cb760aae52
Fix broken layout (Chrome Mobile)
2012-10-25 14:37:41 +03:00
526610e2e7
Templates: relative links instead of absolute ones for /static directory
...
…irector
Two links were absolute ("/static/...") instead of relative
("../static"). The image was not loaded with sites behind reverse
proxies and subdirectory.
2012-10-24 19:48:13 +02:00
a770910a3a
Add LibreJS Licensing information to headers of HTML templates
2012-10-17 17:53:28 +01:00
5c54b2c681
attempt to move onClick away from HTML.. This is required
2012-10-04 21:16:58 +01:00
1258ed3a0d
Split client and server plugin functionality.
...
There is virtually no shared code for the client, extract it into its own
module and do away with the switches.
2012-09-11 21:16:47 -07:00
9394495364
Inject plugins into hooks.
2012-09-11 21:16:47 -07:00
a5f6815e65
Merge pull request #899 from marcelklehr/fix/show-onload-errors
...
Display errors occuring on page load to the user.
2012-08-12 08:55:24 -07:00
85191ca798
Merge pull request #905 from marcelklehr/feature/hook-documentReady
...
Add a documentReady client hook
2012-08-12 08:54:03 -07:00
2fd604973c
Remove the second occurrence of #editorloadingbox
2012-08-02 01:04:52 +02:00
58d5203110
Add a documentReady client_hook.
2012-07-26 12:24:59 +02:00
6f91facf49
Retain original onerror handler.
2012-07-23 15:03:20 +02:00
c3dcb08a2c
Remove console.log
2012-07-23 14:33:30 +02:00
fa3020dffd
Display errors occuring on page load to the user.
2012-07-23 14:12:36 +02:00
9d25dcc1f9
Merge branch 'develop' into feature/connectivity-toolbar
...
Conflicts:
src/templates/pad.html
2012-07-23 11:26:15 +02:00
c3ddff3fa0
Notify the user, if JavaScript is disabled.
2012-07-19 11:34:14 +02:00
eb6be84150
Fix html/css
2012-07-15 16:03:12 +02:00
b1123d11b6
Correct path
2012-07-14 20:35:26 +03:00
4901adeac7
Fix timeslider.
2012-07-14 15:54:44 +02:00
1466fa03a4
Fix some minor mistakes.
2012-07-14 15:54:20 +02:00
4220d6bedd
Put loading git back in.
2012-07-14 15:12:21 +02:00
9a3cb2c727
Sort the toolbar buttons correctly.
2012-07-14 14:54:25 +02:00
444467bef2
Remove connectivity tollbar button.
2012-07-14 14:50:52 +02:00
8ab12ee69e
Only disable toolbar.
...
Make content available and allow scrolling
2012-07-14 14:46:02 +02:00
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