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
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
Chia-liang Kao
4827cdbd96
fix imported ol that were turned into ul
2012-11-02 21:39:40 +08:00
johnyma22
89e38ed4c2
Start putting file system together for admin settings, no where near complete
2012-11-02 13:16:15 +00:00
johnyma22
d929877865
JS fix for #1077 fire event at start because of the resize issue, this is a clean way of doing it
2012-10-30 22:35:01 +00:00
johnyma22
d30bb6d892
fixes a tiny css bug #1077
2012-10-30 21:57:15 +00:00
johnyma22
14ef06c699
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests
2012-10-30 17:22:08 +00:00
John McLear
b2446fa61f
Merge pull request #1098 from Pita/span-two-lines-on-less-than-400px
...
make anything less than 400px span 2 lines on toolbar and make popups ap...
2012-10-29 15:00:11 -07:00
johnyma22
898331b680
fix rtl sanity
2012-10-29 21:55:57 +00:00
johnyma22
4f85bf09cc
make anything less than 400px span 2 lines on toolbar and make popups appear below this
2012-10-29 19:20:02 +00:00
Peter 'Pita' Martischka
0420b89382
Merge pull request #1097 from Pita/develop
...
Pull in Develop branch so we can test latest develop
2012-10-29 07:25:34 -07:00
John McLear
b4680e42d7
add a keystroke check for chat and make it so the chat listens on event 13 aswell as event 10
2012-10-28 17:38:56 +00:00
Marcel Klehr
78e64ffea8
Mimic, replace or work around removed npm utils.
2012-10-28 18:34:20 +01: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
Chia-liang Kao
8199bf8377
Do not assume window object exists
2012-10-23 15:21:05 +08:00
John McLear
429651874f
Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexp
...
Fix #1067 Corrected exports links regexp
2012-10-16 13:36:20 -07:00
Marcel Klehr
6c89187f95
Fix #1067 Corrected exports links regexp
2012-10-16 20:46:27 +02:00
NAGOYA, Yoshihiko
957a0aa873
fix Pita/etherpad-lite #1032
...
refact inInternationalComposition
2012-10-12 01:12:15 +09:00
johnyma22
5c54b2c681
attempt to move onClick away from HTML.. This is required
2012-10-04 21:16:58 +01:00
John McLear
a1280fd917
Merge pull request #1004 from yourcelf/develop
...
Add `userColor` query param to set initial color
2012-10-04 10:57:16 -07:00
John McLear
56453409a5
Update src/static/js/pad_editbar.js
...
Somehow </iframe> was no more. Now it is back.. Oh boy.
2012-10-02 02:19:44 +02:00
Chad Weider
622819ba93
Make intialization of Ace2Inner analogous to other page controllers.
2012-09-21 22:09:55 -07:00
Chad Weider
9f5946c942
Reformat Ace2Editor frame boot scripts.
2012-09-21 22:09:55 -07:00
Chad Weider
fa65f889ec
Consolidate Ace2Editor frame's boot script.
2012-09-21 22:09:55 -07:00
John McLear
923b51033b
List 12 plugins instead of 4
...
4 was a bit stingy :) 12 is a bit more friendly from a UX persepctive.
2012-09-18 15:54:08 +02:00
