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
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
Marcel Klehr
d26f5d64f7
Fix #1130 Reload settings on /admin/settings server restart
2012-11-06 17:35:52 +01:00
Marcel Klehr
e702a86c9f
Add ability to reload settings
2012-11-06 17:35:05 +01: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
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
6f1bab5faf
correct links to example settings.json files
2012-11-05 13:16:07 +00:00
John McLear
b9541f938b
Merge pull request #1127 from Pita/admin-page
...
add express endpoint for admin index.html
2012-11-05 04:59:01 -08:00
John McLear
3766858dd2
add express endpoint for admin index.html
2012-11-05 12:58:02 +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
John McLear
dfa0ae9181
Merge pull request #893 from marcelklehr/feature/plugin-settings
...
Add a new section in settings.json specifically for installed plugins.
2012-11-05 04:48:47 -08:00
Wikinaut
a575de7884
allow favicon.ico as pad name
2012-11-04 13:02:55 +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
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
3ca450fefc
make the server save settings
2012-11-02 15:10:01 +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
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
Peter 'Pita' Martischka
d6d07570bf
added webdriver to npm dependencies
2012-11-01 22:03:51 +00:00
Marcel Klehr
2d6e577683
Put up some '/admin doesn't exist' notice.
2012-11-01 19:45:26 +01:00
John McLear
5629063b9c
Allow robots.txt to be custom
2012-11-01 13:32:04 +00:00
Marcel Klehr
ed2faa68c9
Pass on the req object to eejs hooks
2012-11-01 13:44:59 +01:00
Marcel Klehr
059f6d280e
Pass on the render args to all eejs hooks
...
eejs.require('foo', {..render args..}) will
be passed on to all eejsBlock_X hooks as `hookContext.renderContext`
2012-11-01 13:44:06 +01: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
johnyma22
1c847dbde3
Merge branch 'develop' of github.com:Pita/etherpad-lite into develop
2012-10-29 22:48:32 +00:00
johnyma22
8d7a02816f
remove opacity to fix opera bug #941
2012-10-29 22:47:42 +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
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
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
Marcel Klehr
e447a6fade
Make sure npm is initialized before requiring things ( fix #1092 )
2012-10-28 18:02:49 +01:00
Peter 'Pita' Martischka
9537892c61
wrap spec files with a describe
2012-10-27 17:29:17 +01:00
Peter 'Pita' Martischka
cac27c864a
load list of spec files from the server
2012-10-27 17:05:26 +01:00
Peter 'Pita' Martischka
cc7ddddd2f
redirect from frontend to frontend/
2012-10-27 16:41:17 +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
Randy
399080ad73
Add IIS config file
2012-10-25 10:22:28 -07:00
Randy
596e20e123
Add default port of process.env.PORT if port isnt specified in settings.json
2012-10-25 10:21:34 -07: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
