Peter 'Pita' Martischka
|
b08d948ddd
|
bump travis
|
2012-11-01 23:25:10 +00:00 |
|
Peter 'Pita' Martischka
|
9712e66de5
|
take control over remote test run
|
2012-11-01 23:21:10 +00:00 |
|
Peter 'Pita' Martischka
|
0409ebb30b
|
bloody sauce connect logs...
|
2012-11-01 23:20:28 +00:00 |
|
Peter 'Pita' Martischka
|
1188dea8ff
|
increase timeouts
|
2012-11-01 23:19:59 +00:00 |
|
Peter 'Pita' Martischka
|
82dfb2df21
|
run test lib for a minute in sauce with firefox
|
2012-11-01 22:17:31 +00:00 |
|
Peter 'Pita' Martischka
|
d6d07570bf
|
added webdriver to npm dependencies
|
2012-11-01 22:03:51 +00:00 |
|
Peter 'Pita' Martischka
|
1346222d1c
|
keep sauce tunnel alive
|
2012-11-01 21:46:50 +00: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 |
|
Marcel Klehr
|
3944517aff
|
Merge pull request #1104 from Pita/release/releases-1.1.5
Version 1.1.5 release
|
2012-10-31 08:16:14 -07:00 |
|
Marcel Klehr
|
9cec0391e2
|
Improve changelog v1.1.5
|
2012-10-31 16:15:12 +01:00 |
|
John McLear
|
28acfc70de
|
Merge branch 'develop' of github.com:Pita/etherpad-lite into release/releases-1.1.5
|
2012-10-31 12:32:12 +00: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 |
|
Peter 'Pita' Martischka
|
d6ca5b54f7
|
try to build up the sauce labs tunnel, and tear it down after its etablished
|
2012-10-30 21:49:04 +00:00 |
|
Peter 'Pita' Martischka
|
bbab713c70
|
fixed travis yml
|
2012-10-30 21:04:22 +00:00 |
|
johnyma22
|
fc36f6e9ef
|
clean up the change user name tests to be a bit more sane
|
2012-10-30 17:45:37 +00:00 |
|
johnyma22
|
83a2f3c1a9
|
stop using underscore.org
|
2012-10-30 17:43:33 +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
|
de1c271776
|
CHANGELOG stuff
|
2012-10-30 13:54:49 +00:00 |
|
johnyma22
|
12bd520846
|
bump version #
|
2012-10-30 13:51:29 +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
|
d493f66dda
|
resolve merge conflict for releases 1.1.5
|
2012-10-30 12:24:32 +00:00 |
|
Peter 'Pita' Martischka
|
90751ff2e5
|
...
|
2012-10-29 23:45:22 +00:00 |
|
Peter 'Pita' Martischka
|
52b73f46e1
|
can it start the script?
|
2012-10-29 23:43:27 +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
|
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 |