libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,141 Commits 2 Branches 0 Tags 24 MiB
Commit Graph

93 Commits

Author SHA1 Message Date
Marcel Klehr fdf6628cc5 Fix html attr translation 2012-12-23 18:17:23 +01:00
Marcel Klehr 4a489f85f6 Fix translations in timeslider template 2012-12-23 18:17:08 +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 0371d5ba9e Remove async load of l10n.js because Chrome fail to translate 2012-12-09 09:41:30 +01:00
John McLear d761003588 fix path to favicon resolves #1236 2012-11-30 22:50:54 +00:00
Marcel Klehr 5baef07b55 Load l10n.js first but asynchronusly 2012-11-17 15:28:33 +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
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
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
Wikinaut c92b5283fd fix #377: add favicon url as optional settings.json parameter 2012-11-04 11:26:17 +01: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
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
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
Marcel Klehr eb6be84150 Fix html/css 2012-07-15 16:03:12 +02:00
Marcel Klehr 4901adeac7 Fix timeslider. 2012-07-14 15:54:44 +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
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
Egil Moeller 9f46678e5d Bugfix for IE and document.domain 2012-05-18 18:57:18 +02:00
John McLear def904dbed remove wordle 2012-05-13 20:20:18 +01:00
Matthias Bartelmeß 0e941b498e fix #677 2012-04-29 19:54:38 +02:00
Egil Moeller c173ebe197 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 2012-04-25 17:51:03 +02:00
Matthias Bartelmeß 513deef768 added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670 2012-04-25 10:23:58 +02:00
Egil Moeller ed7e254417 Disconnect handling and cleanup of unused code 2012-04-23 14:47:07 +02:00
John McLear 7766f8aaad Merge pull request #591 from fourplusone/timeslider_authors 
Timeslider authors
 2012-04-05 16:38:55 -07:00
Matthias Bartelmeß 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
Egil Moeller 4325f0b907 Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff 2012-04-05 01:45:14 +02:00
Egil Moeller 08cc3e128f Bugfix for timeslider styling 2012-04-01 14:33:39 +02:00
Egil Moeller 05c2e0fde5 Made all html pages into eejs templates 2012-03-13 18:24:45 +01:00
Renamed from src/static/timeslider.html (Browse further)