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
745a1860ac
Merge pull request #1145 from marcelklehr/fix/contributing-md
...
Try to clean up CONTRIBUTING.md
2012-11-08 08:52:44 -08:00
Marcel Klehr
545026affa
Try to clean up CONTRIBUTING.md
...
and make things clearer
2012-11-08 17:50:17 +01:00
John McLear
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
John McLear
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
Jason Woofenden
01727d1542
fix typo in Linux install instructions
2012-11-07 23:31:24 -05:00
John McLear
e1edc8079f
Merge pull request #1138 from btherres/develop
...
fix installDeps.sh for solaris compatibility
2012-11-07 04:13:25 -08:00
Bastian
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
John McLear
6148548e00
Fix unclickable / broken links to IRC webchat
2012-11-07 11:10:36 +01: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
04166f4fbc
Merge pull request #1134 from Pita/resize-settings-textarea
...
resolve #1131 make textarea resize
2012-11-06 03:59:22 -08: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
051927cbc8
Merge pull request #1126 from Pita/remove-available-plugins-folder
...
@redhog said its okay to remove this folder as it serves no purpose
2012-11-05 04:49:09 -08: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
John McLear
b6b99f7389
@redhog said its okay to remove this folder as it serves no purpose
2012-11-05 12:44:05 +00: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
Marcel Klehr
0fa25264bc
Merge pull request #1119 from clkao/import-ol
...
Import <ol>'s as <ol>'s and not as <ul>'s!
2012-11-03 11:11:34 -07: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
John McLear
af3513873f
Merge pull request #1118 from marcelklehr/feature/customize-app-title
...
Add a setting for customizing the app title
2012-11-02 05:59:15 -07: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
b9f4e8450c
Merge pull request #1114 from marcelklehr/fix/admin-unimplemented-notice
...
Put up some '/admin doesn't exist' notice.
2012-11-01 11:46:47 -07:00
Marcel Klehr
2d6e577683
Put up some '/admin doesn't exist' notice.
2012-11-01 19:45:26 +01:00
johnyma22
1da39d3d1a
Merge branch 'develop' of github.com:Pita/etherpad-lite into develop
2012-11-01 18:31:02 +00:00
John McLear
2311b0fbb4
Merge pull request #1112 from marcelklehr/docs/custom-folder
...
[docs] Document custom static files.
2012-11-01 06:52:11 -07:00
Marcel Klehr
6a027a1c2c
[docs] Document custom static files.
2012-11-01 14:48:19 +01:00
John McLear
5629063b9c
Allow robots.txt to be custom
2012-11-01 13:32:04 +00:00
John McLear
0cbacf5b4b
Merge pull request #1111 from marcelklehr/feature/eejs-pass-args-to-hooks
...
Pass on the render args to all eejs hooks
2012-11-01 05:51:04 -07:00
johnyma22
d7d2f5de2d
Merge branch 'feature/eejs-pass-args-to-hooks' of git://github.com/marcelklehr/etherpad-lite into develop
2012-11-01 12:49:36 +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
John McLear
247072b6d1
Merge pull request #1109 from yourcelf/patch-1
...
Add api docs for `userColor` query arg
2012-10-31 12:31:33 -07:00
yourcelf
13cef386f8
Add api docs for userColor query arg
2012-10-31 16:28:12 -03:00
Marcel Klehr
f676e90199
[docs] Fix assets: Rename doc/_assets to doc/assets
...
github's jekyll would do some dark magic with '_assets'.
We don't want that.
2012-10-31 18:12:12 +01:00
John McLear
437937c350
Merge pull request #1103 from marcelklehr/docs/http-api-versions
...
[docs] Add api version numbers for all endpoints
2012-10-31 05:26:10 -07: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
4162ff09e4
Merge branch 'develop' of github.com:Pita/etherpad-lite into develop
2012-10-30 21:58:08 +00:00
