John McLear
1c7810783c
gritter now implemented
2013-01-29 01:55:36 +00:00
John McLear
090508909e
Merge pull request #1389 from ether/disconnect-eejs-block
...
add eejs block for disconnect
2013-01-26 09:06:53 -08:00
John McLear
0ccd1a30e9
Merge pull request #1390 from ether/html-head-block-eejs
...
add a html block eejs so you can add a cache manifest
2013-01-26 09:06:38 -08:00
mluto
7812d93e74
Fixed "unnamed" and "enter your name" in userlist
2013-01-25 10:32:09 +01:00
John McLear
9129c6970a
add a html block eejs so you can add a cache manifest
2013-01-23 02:46:57 +00:00
John McLear
b76f084f3a
add eejs block for disconnect
2013-01-23 01:01:35 +00:00
mluto
9c364d7d38
Added a template block for #users
2013-01-20 13:56:51 +01:00
John McLear
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
mluto
bc05f9eb0a
converted load-more-link to button, added loading-gif, fixed typo
2013-01-07 19:15:55 +01:00
mluto
5f81daed0a
Added link to load more chat-messages using new GET_CHAT_MESSAGES
2013-01-07 17:36:03 +01:00
mluto
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
Marcel Klehr
fdf6628cc5
Fix html attr translation
2012-12-23 18:17:23 +01:00
Marcel Klehr
67c893aaca
Fix html10n and the locale resource <link>s
2012-12-23 18:16:39 +01:00
Marcel Klehr
53521c8732
Replace webL10n with html10n.js
2012-12-23 18:16:13 +01:00
Iván Eixarch
ff8b4b6b20
change key of message sucessfull on import
2012-12-09 17:34:32 +01:00
Iván Eixarch
0371d5ba9e
Remove async load of l10n.js because Chrome fail to translate
2012-12-09 09:41:30 +01:00
Guillaume AMAT
c853f8fad2
Reduces the width of the file input to prevent overflow in the import popup
2012-12-05 15:02:32 +01:00
John McLear
b3e55f64a8
stop password being clearly visible
2012-12-03 13:10:32 +00:00
John McLear
bef25b40f8
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-03 11:37:01 +00:00
root
84d154b168
Update strings, add UK strings, fix JS
2012-12-03 11:35:06 +00:00
Iván Eixarch
657322db91
fixed git merge confict
2012-12-03 01:39:59 +01:00
John McLear
c9a5e55654
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:06:33 +00:00
root
3cdf66c2f7
first effort to move into templates but javascript is broken so dont pull
2012-12-02 17:03:56 +00:00
John McLear
d761003588
fix path to favicon resolves #1236
2012-11-30 22:50:54 +00:00
Iván Eixarch
d7cca602df
Added message translatable about features importing without abiword
2012-11-26 03:18:47 +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
Marcel Klehr
b416402f10
Fix language auto-detection
2012-11-14 19:38:35 +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
0ip
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01: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
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
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
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
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
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
