2657f06887
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n
2012-11-14 10:19:52 +00: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
e0935d9e25
Update src/locales/fr.ini
2012-11-13 20:09:02 +00:00
c65a03aaff
Update src/locales/fr.ini
2012-11-13 20:08:38 +00:00
a041cea834
French translation thanks to Francis-William Rhaume
2012-11-13 20:06:44 +00:00
5b23e99d8c
resolve #1044
...
https://github.com/Pita/etherpad-lite/issues/1044
2012-11-13 19:23:55 +00:00
c008d7bbbe
Merge branch 'develop' into feature/i18n
2012-11-13 08:47:38 -08:00
7d174855c4
Give the browser more time to save the cookie at change_user_name test
2012-11-13 08:39:48 -08:00
e13219fec9
deactive test for issue #1125
2012-11-13 08:05:05 -08:00
3830c878d2
change language test -- note i didnt include test for cookie persistance
2012-11-13 07:47:47 -08: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
b28afe4c47
Adjust border-color of #sidediv
2012-11-13 12:42:52 +01:00
c2253e49b6
Add ability to set language via URL parameter
2012-11-12 18:31:02 +01:00
b38f5d8f0c
Fix German translation
2012-11-12 18:11:06 +01:00
19c12239f6
Simplify lang setting in pad.html template
2012-11-12 18:04:21 +01:00
993d501943
Make L10n.js requireable
2012-11-12 17:42:07 +01:00
ed3020c729
Translate timeslider export links
2012-11-12 17:34:29 +01:00
e81563e18d
German translation for timeslider
2012-11-12 17:26:20 +01:00
3bc59f0a7c
Add english translation file
2012-11-12 17:25:53 +01:00
378a74fb4e
Remove translated strings from template files
2012-11-12 17:24:14 +01:00
4154d464a5
Fix german translation
2012-11-12 16:53:39 +01:00
7021a8b885
Add pad setting for UI lang
2012-11-12 16:49:15 +01:00
03d3cd9f24
back to sauce connect download from sauce labs
2012-11-11 19:07:41 -08:00
68ed9b219f
Fixed another sendkeys bug
2012-11-11 19:04:28 -08:00
e385e78310
IE9 doesn't need special IE treatment and works much better with the W3C sendkeys methods
2012-11-11 18:21:43 -08:00
fb340793da
Add an empty locales/en.ini - English is default lang in templates
2012-11-11 11:56:59 +01:00
e914c972f4
Add german translation for index.html and pad.html
2012-11-10 14:13:51 +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
a3504f70c4
Add i18n component
2012-11-10 14:12:17 +01:00
e24ed46a08
PadMessageHandler: Make sure sessioninfos[session] still exists before pushing data to user.
2012-11-10 10:47:12 +01:00
b057759eae
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
...
npm must be npm.load'ed before using it
2012-11-09 22:06:26 +01:00
dc3db7a4a8
Merge pull request #1147 from kingmook/develop
...
Fix Issue #1122 RE: IE9 and Password Protected Pads using HTTPS
2012-11-08 11:09:43 -08:00
34594eb88b
Update src/static/js/pad.js
...
Check if the browser is IE and if so output the entire path via document.location over document.location.pathname to the cookie creation in createCookie()
2012-11-08 13:47:21 -05:00
745a1860ac
Merge pull request #1145 from marcelklehr/fix/contributing-md
...
Try to clean up CONTRIBUTING.md
2012-11-08 08:52:44 -08:00
545026affa
Try to clean up CONTRIBUTING.md
...
and make things clearer
2012-11-08 17:50:17 +01:00
8bb8e484ee
Merge pull request #1135 from marcelklehr/fix/server-restart-settings-reload
...
/admin/settings: reload settings on server restart
2012-11-08 08:33:56 -08:00
9f76d24646
Merge pull request #1143 from JasonWoof/fix-linux-install-instructions
...
fix typo in Linux install instructions
2012-11-08 06:15:40 -08:00
01727d1542
fix typo in Linux install instructions
2012-11-07 23:31:24 -05:00
e1edc8079f
Merge pull request #1138 from btherres/develop
...
fix installDeps.sh for solaris compatibility
2012-11-07 04:13:25 -08:00
05f96429ef
added solaris compatibility: removed -v flag from cp, witch is not known by solaris cp // added condition for gnu-grep (ggrep), solaris grep has no -o flag
2012-11-07 12:51:51 +01:00
6148548e00
Fix unclickable / broken links to IRC webchat
2012-11-07 11:10:36 +01:00
d26f5d64f7
Fix #1130 Reload settings on /admin/settings server restart
2012-11-06 17:35:52 +01:00
e702a86c9f
Add ability to reload settings
2012-11-06 17:35:05 +01:00
7febd3ff5c
Resolve #583
...
This kinda resolves the issue but not in a very graceful way. It means any numbered items > 99 will still be cropped.
The problem is due to no padding/margin and then needing to specify margin.
you can replicate this bug with
```
<body style="padding:0; margin:0">
<style type="text/css">
li:nth-child(n+10){
margin-left:1.6em;
}
</style>
<ol style="list-style-type: decimal;margin-left:1.5em;padding:0;">
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
<li>
1
</li>
</ol>
</body>
```
2012-11-06 12:37:35 +00:00
04166f4fbc
Merge pull request #1134 from Pita/resize-settings-textarea
...
resolve #1131 make textarea resize
2012-11-06 03:59:22 -08: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
John McLear