John McLear
0b92fdfc62
fix IE auth but only a temp fix
2012-12-03 12:47:11 +00:00
John McLear
d09894ce77
make it show password dialog on wrong password
2012-12-03 12:05:11 +00:00
John McLear
4843840d72
last JS fix
2012-12-03 11:44:30 +00:00
John McLear
b0463bd7d5
whoopsi
2012-12-03 11:41:51 +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
a74defdab7
Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:07:23 +00: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
3dcbd8dd4e
fix the control S to save a revision
2012-11-30 23:28:34 +00:00
John McLear
a4c4d11cd4
fix letter s...
2012-11-30 15:26:51 -08:00
John McLear
93e9d7c852
remove control S comment
2012-11-28 17:20:58 +00:00
John McLear
8c7939ec9f
catch control S and send an event to save a revision
2012-11-28 17:17:35 +00:00
John McLear
c445197e7f
Update src/static/css/pad.css
2012-11-27 15:10:36 +00:00
John McLear
f880473360
remember the styling for the pasword prompt
2012-11-26 20:54:28 +00:00
John McLear
fddca354b3
proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix
2012-11-26 20:52:10 +00:00
John McLear
b66c9135f7
Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap
2012-11-26 20:20:21 +00:00
John McLear
6239c66e36
remove alert on line wrap as it doesnt mean anything
2012-11-26 20:19:27 +00:00
John McLear
491bf515c6
Merge pull request #1199 from leblanc-simon/develop
...
improving the translation of the timeline
2012-11-26 11:48:08 -08:00
Wikinaut
a49bab5dae
fix timeslider rightstep button position
2012-11-26 08:54:13 +01:00
Iván Eixarch
d7cca602df
Added message translatable about features importing without abiword
2012-11-26 03:18:47 +01:00
Iván Eixarch
0250f8d55c
Merge remote branch 'ether/develop'
2012-11-23 22:57:05 +01:00
Iván Eixarch
cc60b82a6e
Import html by default and allow basic import/export features without abiword
2012-11-23 22:55:25 +01:00
Simon Leblanc
94e9cf0a32
improving the translation of the timeline
2012-11-23 06:20:09 +01:00
John McLear
1899e3f48d
Merge pull request #1197 from hcartiaux/urlfix
...
Fix urls, use github.com/ether
2012-11-21 16:22:21 -08:00
Hyacinthe Cartiaux
d6027726e6
Fix urls, use github.com/ether
...
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-22 01:12:30 +01:00
Mike Brousseau
196aafd9d6
Update src/static/js/pad.js
...
Gramatically change. Changed "You're Password" to "Your Password".
2012-11-21 13:35:47 -05:00
John McLear
34df9d651e
Merge pull request #1188 from joker-x/master
...
Allow ! in pads urls
2012-11-21 09:53:58 -08:00
Marcel Klehr
dcb3da829d
Fix #1186 Autodetection wouldn't work correctly in IE9
2012-11-21 17:45:01 +01:00
Iván Eixarch
beb5bf4d7d
Merge remote branch 'ether/develop'
2012-11-21 03:37:42 +01:00
Iván Eixarch
0c70ada9d7
Allow ! in urls autodetection
2012-11-21 03:35:49 +01:00
Marcel Klehr
8a23c2ff50
Use ; as comments indicator in i18n files
2012-11-20 22:08:42 +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
0ip
b28afe4c47
Adjust border-color of #sidediv
2012-11-13 12:42:52 +01:00
0ip
c2253e49b6
Add ability to set language via URL parameter
2012-11-12 18:31:02 +01:00
Marcel Klehr
993d501943
Make L10n.js requireable
2012-11-12 17:42:07 +01:00
Marcel Klehr
7021a8b885
Add pad setting for UI lang
2012-11-12 16:49:15 +01:00
Marcel Klehr
a3504f70c4
Add i18n component
2012-11-10 14:12:17 +01:00
Mike Brousseau
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
John McLear
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
John McLear
f68bdde0c1
resolve #1131 make textarea resize
2012-11-06 11:56:19 +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
Peter 'Pita' Martischka
6408581adb
merged develop back in
2012-11-03 18:16:36 +00:00
johnyma22
2f123970e6
Make express restart - I think this reloads settings
2012-11-02 15:21:12 +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
