John McLear
aee0fd797d
working translation
2015-01-21 16:11:00 +00:00
John McLear
63c65f784b
semi working example
2015-01-19 01:45:49 +00:00
John McLear
036b7d2890
Merge pull request #2418 from ether/etherpad-export-and-import
...
Full Pad portability (Export/Import)
2014-12-31 13:32:09 +00:00
John McLear
3773b6346b
semi working requires browser refresh
2014-12-29 20:57:58 +01:00
Gared
018821e98c
Use camel case
2014-12-28 22:20:09 +01:00
Gared
2307c6fbda
Notify user if cookies can't be created
2014-12-28 15:02:56 +01:00
John McLear
ae22332f71
removing dokuwiki
2014-12-27 14:08:45 +01:00
John McLear
9b66c93d6b
swap out jquery browser for bower but expose browser object to all pages also enable minification.. Seems to work well
2014-11-22 19:11:35 +00:00
John McLear
16d8068d7d
Merge branch 'develop' of github.com:ether/etherpad-lite into new-icons
2014-11-19 00:17:01 +00:00
John McLear
9aea689438
move tiny bit of font awesome we actually use into pad.css
2014-11-19 00:16:08 +00:00
John McLear
0f1fd0b281
working blocks
2014-11-18 23:51:22 +00:00
John McLear
9712f852e9
remove connecting bar image
2014-11-18 19:16:50 +00:00
John McLear
9b5ee93bce
spinning loading icons
2014-11-18 19:13:51 +00:00
John McLear
c14e1696b3
remove stuff, new files
2014-11-18 18:09:29 +00:00
Prateek Saxena
ca32ac89b6
Add a subset of FontAwesome icons using Fontello
...
Most of the code here has been taken from @LaKing's #2554 .
Only icons required for etherpad have been added. Here is a
list of the code points that are being used:
0xe800 0xe801 0xe802 0xe803
0xe804 0xe805 0xe806 0xe807
0xe808 0xe809 0xe80a 0xe80b
0xe80c 0xe80d 0xe80e 0xe80f
0xe810 0xe811 0xe812 0xe813
0xe814 0xe815 0xe816 0xe817
Their related icon names can be seen in:
/src/static/css/fontawesome-etherpad.css
Even though this patch *adds* all the required icons it only
uses them in the in toolbar. The switch to using only FontAwesome
icons and the removal of old PNG files will only happen after the
timeslider interface has been updated.
This is the first step for #2253
2014-10-14 09:16:44 +05:30
0ip
12c1d3b05a
Fix active button ui
2014-10-03 17:35:48 +02:00
Marcel Klehr
a369347d86
Merge branch 'pr/1579' into toolbar-test
...
Conflicts:
settings.json.template
src/static/js/pad_editbar.js
2014-03-16 13:30:22 +01:00
John McLear
24e96c4f8b
Merge pull request #2028 from webzwo0i/remove-deadcode
...
Remove deadcode
2013-12-09 10:49:57 -08:00
webzwo0i
4044d5ae47
remove hidden input field padId which is send on every import but not used
2013-12-08 17:14:01 +01:00
John McLear
98c4e32a14
Merge pull request #2026 from ether/afterEditHook
...
after Edit eejs block
2013-12-07 08:55:04 -08:00
John McLear
749e557b84
after Edit eejs block
2013-12-04 23:17:32 +00:00
Eloy
de3a657c6b
Update pad.html
...
Select the URL when click at the text.
2013-12-02 16:43:52 +01:00
Marcel Klehr
7f10b9a42f
Add explanations for more disconnect scenarios
2013-10-10 21:11:15 +02:00
John McLear
e35c45e9b5
make export clearly seperated from import
2013-09-21 16:22:43 +01:00
cohitre
90837437c5
Moving the toolbar plugin calls.
2013-04-13 12:06:51 -07:00
John McLear
6dc4ddd29e
no need for the language string on that div
2013-04-05 03:38:47 +01:00
John McLear
406ff8e6f8
Merge pull request #1681 from ether/loading_block
...
Loading blocks
2013-03-28 20:01:46 -07:00
John McLear
d73ea4e334
Loading blocks
2013-03-29 02:24:15 +00:00
John McLear
2e7a9796de
option to show sticky chat on screen, note i use a literal string, how am i supposed to add a l10n title?
2013-03-24 01:12:01 +00:00
cohitre
988653b8ce
Toolbar hooks
2013-03-12 19:36:04 -07:00
cohitre
292a3bd7b7
Setting up the right toolbar.
2013-03-09 14:57:42 -08:00
Marcel Klehr
760e1b82c3
Add a setting for RTL text direction (integrating the url paramter)
...
Fixes #1191
2013-03-05 23:12:00 +01:00
cohitre
c57bc444cd
basic toolbar setup
2013-03-03 16:06:14 -08:00
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
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
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
2012-07-12 10:23:55 +02:00
John McLear
6726ea6632
option to stop autoscroll
2012-07-11 17:42:59 +01:00
