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 |
|
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 |
|
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 |
|
johnyma22
|
d30bb6d892
|
fixes a tiny css bug #1077
|
2012-10-30 21:57:15 +00:00 |
|
Marcel Klehr
|
dd1e383d6e
|
Bump api version in #usage section
|
2012-10-30 14:35:26 +01:00 |
|
Marcel Klehr
|
ef923209b0
|
Refactor structure of api/http_api.md and add api version numbers for all endpoints.
|
2012-10-30 14:18:50 +01:00 |
|
John McLear
|
0702f4e58c
|
Get involved text
|
2012-10-30 13:03:33 +00:00 |
|
John McLear
|
82f1abf7cf
|
Don't depend on Bit.ly to get people to the EP
Bit.ly is a problem if we change endpoints. Using etherpad.org gives us full control.
https://github.com/Pita/etherpad-lite/issues/1099
|
2012-10-30 12:59:16 +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 |
|
John McLear
|
4afc9ccbdf
|
Merge pull request #1094 from marcelklehr/fix/doc-generator
Change filename hooks.md -> hooks_overview.md
|
2012-10-29 06:36:56 -07:00 |
|
John McLear
|
5646759dc6
|
Merge pull request #1095 from marcelklehr/docs/improve-doc-generation
Documentation improvements
|
2012-10-29 06:36:38 -07:00 |
|
John McLear
|
05cc7b3fd5
|
Merge pull request #1096 from marcelklehr/fix/server-startup-npm
Fix npm
|
2012-10-28 11:02:48 -07: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 |
|
Marcel Klehr
|
7a8401c363
|
Add recipe for doc assets and some basic styling for the generated docs.
|
2012-10-27 18:47:09 +02:00 |
|
Marcel Klehr
|
3d1fd05085
|
Insert epl version into template.
|
2012-10-27 17:28:15 +02:00 |
|
Marcel Klehr
|
94e399e8a9
|
Change filename hooks.md -> hooks_overview.md
so it doesn't confuse tools/doc/generator
|
2012-10-27 16:30:31 +02:00 |
|
John McLear
|
d5ace6c163
|
Merge pull request #1091 from kingkaeru/feature/iisnode_support
Feature/iisnode support
|
2012-10-25 16:25:00 -07: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
|
a80eb93f75
|
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop
|
2012-10-25 09:41:24 -07:00 |
|
John McLear
|
ff2e7ead09
|
add a script to migrate from dirtyDB to MYSQL thanks to http://blog.codeborne.com
|
2012-10-25 09:40:33 -07:00 |
|
John McLear
|
344ba31c92
|
fix paths in convert.js so it works
|
2012-10-25 09:35:33 -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 |
|
John McLear
|
4c72507ff0
|
Merge pull request #1090 from marcelklehr/docs/add-pluginfw
Add docs for plugins and plugin framework
|
2012-10-25 06:53:14 -07:00 |
|
John McLear
|
a01768fc46
|
Merge pull request #1086 from neurolit/patch_relative_static_links
Templates: relative links instead of absolute ones for /static directory
|
2012-10-25 06:52:16 -07:00 |
|
Marcel Klehr
|
63e4aafae8
|
Add docs for plugins and plugin framework
@redhog please elaborate on / improve 'doc/api/pluginfw.md'!
|
2012-10-25 15:45:06 +02:00 |
|
John McLear
|
58d559b962
|
fix marcels trailing ,
|
2012-10-25 05:24:42 -07:00 |
|
John McLear
|
9582881278
|
Merge pull request #1088 from marcelklehr/fix/update-npm
Update npm
|
2012-10-25 05:21:11 -07:00 |
|
John McLear
|
0e9695bfb0
|
Merge pull request #1089 from marcelklehr/legal/extend-collaboraters
Add myself to the list of contributers
|
2012-10-25 05:20:49 -07:00 |
|
Marcel Klehr
|
ff2824ae7a
|
Add "Marcel Klehr" to contributers list
|
2012-10-25 13:45:40 +02:00 |
|
Marcel Klehr
|
1bc9d61027
|
Update npm (fix #1012)
|
2012-10-25 13:38:28 +02:00 |
|
0ip
|
cb760aae52
|
Fix broken layout (Chrome Mobile)
|
2012-10-25 14:37:41 +03:00 |