Iván Eixarch
8ac49477f9
Fix 1203: non-escaped html in plugins info
2012-11-24 00:42:44 +01:00
Iván Eixarch
1e71797ad5
Replace Globalize with languages module
2012-11-20 19:46:17 +01:00
Marcel Klehr
5baef07b55
Load l10n.js first but asynchronusly
2012-11-17 15:28:33 +01:00
Sarhan Aissi
716aa13a79
Fix examples url in settings.html to use ether/
2012-11-16 10:39:38 +01:00
John McLear
68b1d78f32
Merge pull request #1159 from marcelklehr/fix/lang-autodetection
...
Fix language auto-detection
2012-11-14 10:58:07 -08:00
Marcel Klehr
b416402f10
Fix language auto-detection
2012-11-14 19:38:35 +01:00
0ip
dcff0d74ef
Fix Timeslider translation not showing up
2012-11-14 19:31:09 +01:00
Marcel Klehr
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
Marcel Klehr
ffb7cf47f2
Mate timslider page title translateable
2012-11-14 15:31:43 +01:00
0ip
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01:00
John McLear
838a1e3d69
just export on timeslider, no import..
2012-11-14 09:31:27 +00:00
John McLear
0e6a701f92
Update src/templates/timeslider.html
2012-11-14 09:20:16 +00:00
Peter 'Pita' Martischka
6de7634357
merged develop back in
2012-11-13 07:43:48 -08:00
Peter 'Pita' Martischka
4c095202bd
Merged branch feature/frontend-tests
2012-11-13 07:29:57 -08:00
Marcel Klehr
19c12239f6
Simplify lang setting in pad.html template
2012-11-12 18:04:21 +01:00
Marcel Klehr
ed3020c729
Translate timeslider export links
2012-11-12 17:34:29 +01:00
Marcel Klehr
378a74fb4e
Remove translated strings from template files
2012-11-12 17:24:14 +01:00
Marcel Klehr
7021a8b885
Add pad setting for UI lang
2012-11-12 16:49:15 +01:00
Marcel Klehr
e5d1c6b279
Allow translation of pad.html
2012-11-10 14:13:10 +01:00
Marcel Klehr
145e893273
Allow translations for index.html
2012-11-10 14:12:58 +01:00
John McLear
f68bdde0c1
resolve #1131 make textarea resize
2012-11-06 11:56:19 +00:00
John McLear
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
John McLear
6f1bab5faf
correct links to example settings.json files
2012-11-05 13:16:07 +00:00
John McLear
b9541f938b
Merge pull request #1127 from Pita/admin-page
...
add express endpoint for admin index.html
2012-11-05 04:59:01 -08:00
John McLear
3766858dd2
add express endpoint for admin index.html
2012-11-05 12:58:02 +00:00
John McLear
b6a331b9ec
Merge pull request #1120 from Pita/feature/settings-admin
...
Modify Server Settings in /admin/settings
2012-11-05 04:48:59 -08:00
Wikinaut
c92b5283fd
fix #377 : add favicon url as optional settings.json parameter
2012-11-04 11:26:17 +01:00
Peter 'Pita' Martischka
6408581adb
merged develop back in
2012-11-03 18:16:36 +00:00
johnyma22
1d055f2cd4
make stuff work
2012-11-02 15:15:13 +00:00
johnyma22
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
johnyma22
f6fa897a4e
actually using text area is a lot less stupid
2012-11-02 14:31:52 +00:00
johnyma22
89e38ed4c2
Start putting file system together for admin settings, no where near complete
2012-11-02 13:16:15 +00:00
Marcel Klehr
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
johnyma22
14ef06c699
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-30 17:22:08 +00:00
johnyma22
8d7a02816f
remove opacity to fix opera bug #941
2012-10-29 22:47:42 +00:00
johnyma22
4f04d14cab
Merge branch 'develop' of github.com:Pita/etherpad-lite into develop
2012-10-29 19:30:29 +00:00
johnyma22
0e41e9fdfc
allow max chat to be 999 chars
2012-10-29 19:29:30 +00:00
Peter 'Pita' Martischka
f59b643aa6
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-27 16:32:37 +01:00
John McLear
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
John McLear
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
0ip
cb760aae52
Fix broken layout (Chrome Mobile)
2012-10-25 14:37:41 +03:00
neurolit
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
johnyma22
a770910a3a
Add LibreJS Licensing information to headers of HTML templates
2012-10-17 17:53:28 +01:00
johnyma22
5c54b2c681
attempt to move onClick away from HTML.. This is required
2012-10-04 21:16:58 +01:00
Chad Weider
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
Chad Weider
9394495364
Inject plugins into hooks.
2012-09-11 21:16:47 -07:00
John McLear
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
John McLear
85191ca798
Merge pull request #905 from marcelklehr/feature/hook-documentReady
...
Add a documentReady client hook
2012-08-12 08:54:03 -07:00
Marcel Klehr
2fd604973c
Remove the second occurrence of #editorloadingbox
2012-08-02 01:04:52 +02:00
Marcel Klehr
58d5203110
Add a documentReady client_hook.
2012-07-26 12:24:59 +02:00
Marcel Klehr
6f91facf49
Retain original onerror handler.
2012-07-23 15:03:20 +02:00
Marcel Klehr
c3dcb08a2c
Remove console.log
2012-07-23 14:33:30 +02:00
Marcel Klehr
fa3020dffd
Display errors occuring on page load to the user.
2012-07-23 14:12:36 +02:00
Marcel Klehr
9d25dcc1f9
Merge branch 'develop' into feature/connectivity-toolbar
...
Conflicts:
src/templates/pad.html
2012-07-23 11:26:15 +02:00
Marcel Klehr
c3ddff3fa0
Notify the user, if JavaScript is disabled.
2012-07-19 11:34:14 +02:00
Marcel Klehr
eb6be84150
Fix html/css
2012-07-15 16:03:12 +02:00
0ip
b1123d11b6
Correct path
2012-07-14 20:35:26 +03:00
Marcel Klehr
4901adeac7
Fix timeslider.
2012-07-14 15:54:44 +02:00
Marcel Klehr
1466fa03a4
Fix some minor mistakes.
2012-07-14 15:54:20 +02:00
Marcel Klehr
4220d6bedd
Put loading git back in.
2012-07-14 15:12:21 +02:00
Marcel Klehr
9a3cb2c727
Sort the toolbar buttons correctly.
2012-07-14 14:54:25 +02:00
Marcel Klehr
444467bef2
Remove connectivity tollbar button.
2012-07-14 14:50:52 +02:00
Marcel Klehr
8ab12ee69e
Only disable toolbar.
...
Make content available and allow scrolling
2012-07-14 14:46:02 +02:00
Marcel Klehr
6da6a7f0d8
Use nice editbar popups for connection status instead of srceen-blocking modals.
2012-07-13 08:23:22 +02:00
Marcel Klehr
7653db36fe
Revert "option to stop autoscroll"
...
This reverts commit 6726ea6632
.
Conflicts:
src/static/js/chat.js
2012-07-12 10:23:55 +02:00
John McLear
6726ea6632
option to stop autoscroll
2012-07-11 17:42:59 +01:00
John McLear
e4ff4021ab
Merge pull request #810 from redhog/aceEditEvent
...
Plugin/hook features&bugfixes
2012-06-22 03:53:50 -07:00
0ip
48daf83a30
#763 : Use spaces instead of tabs
2012-06-13 13:56:09 +03:00
Clark Boylan
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
Egil Moeller
3338db9485
Bugfixes
2012-06-05 13:32:33 +02:00
Egil Moeller
cf2f0b72a3
More plugin information
2012-06-04 14:33:38 +02:00
Egil Moeller
ad68a6e3bf
Bugfix for Chads new toolbar styling
2012-05-30 17:41:43 +02:00
Egil Moeller
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
Chad Weider
7f9bfd6b26
Add comments to templates.
2012-05-28 15:14:52 -07:00
Chad Weider
96ab3dc3b4
jQuery is packaged - this is pure duplication.
2012-05-28 15:14:52 -07:00
Chad Weider
d5ac2bfb71
Explicitly require jQuery before using it.
2012-05-28 15:14:52 -07:00
Chad Weider
595fc5710e
Add ace2_common to bottom of the page includes.
2012-05-28 15:14:52 -07:00
John McLear
9c6731f3b8
No comet required on landing page
2012-05-22 21:30:50 +02:00
0ip
caa56dd32a
Add non-floating popups
2012-05-20 15:59:51 +02:00
0ip
205797cd83
Remove class duplicate
2012-05-20 15:35:41 +02:00
0ip
fbee7dabcf
Add grouped buttons
2012-05-20 15:29:10 +02:00
0ip
0d68cd23ba
Remove old CSS code
2012-05-20 14:48:02 +02:00
John McLear
fbc2cb32b3
Merge pull request #705 from johnyma22/removeWordle
...
Remove wordle
2012-05-19 05:58:38 -07:00
John McLear
53bfc380af
Merge pull request #703 from cweider/remove-onclick
...
Remove onclick
2012-05-19 05:41:49 -07:00
Egil Moeller
9f46678e5d
Bugfix for IE and document.domain
2012-05-18 18:57:18 +02:00
Egil Moeller
fc946ffc33
Hide editing buttons when in readonly mode
2012-05-17 12:03:38 +02:00
Chad Weider
d65092e067
Move id, '*link' to the link.
2012-05-14 17:11:05 -07:00
Chad Weider
1ea889bfab
Anchors are not icons
2012-05-13 15:33:22 -07:00
Chad Weider
2a3fce0cf1
The showusers control is an anchor.
2012-05-13 15:33:22 -07:00
Chad Weider
dc0fb12b09
Remove onclick attributes from editbar.
2012-05-13 15:33:22 -07:00
John McLear
def904dbed
remove wordle
2012-05-13 20:20:18 +01:00
Edy
47a257ff72
accidentally deleted an end block in last merge
2012-05-01 12:02:12 +02:00
Edy
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
0ip
64db697558
Fixed typos
2012-04-30 16:54:19 +02:00
0ip
23cdb2a5c6
Removed QR-Code
2012-04-30 15:54:21 +02:00
Edy
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
John McLear
a73192b10d
Merge pull request #680 from fourplusone/fix/fix-677
...
Fix #677
2012-04-29 10:57:35 -07:00
Matthias Bartelmeß
0e941b498e
fix #677
2012-04-29 19:54:38 +02:00
John McLear
f6bdbddfcc
Merge pull request #679 from 0ip/highl_mod
...
Tidy up wobbly button highlighting code
2012-04-29 08:10:52 -07:00
0ip
4b272fe2e1
Tidied up highlighting for currently opened module
2012-04-29 01:00:31 +02:00