fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,065 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

2065 Commits

Author SHA1 Message Date
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
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
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
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
John McLear 5646759dc6 Merge pull request #1095 from marcelklehr/docs/improve-doc-generation 
Documentation improvements
 2012-10-29 06:36:38 -07:00
Peter 'Pita' Martischka 9ac025d7fa Revert "another one..." 
This reverts commit 2a327c9ece.
 2012-10-29 11:37:41 +00:00
Peter 'Pita' Martischka 2a327c9ece another one... 2012-10-29 00:17:32 +00:00
Peter 'Pita' Martischka 30e6358e71 senseless commit to get travis awake 2012-10-28 21:21:17 +00:00
Peter 'Pita' Martischka 23c5cd83b9 travis, will you like this? 2012-10-28 18:51:05 +00:00
John McLear 2f26086c5d fix timeslider test 2012-10-28 18:36:22 +00:00
John McLear e9e59700ae fix chat always on screen test 2012-10-28 18:25:29 +00:00
John McLear 72d40fcfd4 fix button redo spec 2012-10-28 18:19:16 +00:00
John McLear 05cc7b3fd5 Merge pull request #1096 from marcelklehr/fix/server-startup-npm 
Fix npm
 2012-10-28 11:02:48 -07:00
John McLear 54f6ac451a Merge branch 'feature/frontend-tests' of git://github.com/Pita/etherpad-lite into feature/frontend-tests 2012-10-28 18:02:11 +00:00
John McLear c6cbdb5dc2 bring underscore in local so we dont depend on underscore.org being up 2012-10-28 17:56:03 +00:00
John McLear 2bd63cbfed make sure change user name forgets old user names 2012-10-28 17:52:40 +00:00
John McLear e33678e625 extend changing username to make sure it shows up the changes in the chat dialogue for new messages 2012-10-28 17:47:17 +00: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 c021cf52d8 download and start the sauce connector in travis 2012-10-28 16:48:51 +00:00
Peter 'Pita' Martischka 7903eb93b6 first version of a travis.yml file 2012-10-28 15:40:42 +00:00
Peter 'Pita' Martischka 94faa6d3b2 comments 2012-10-28 13:22:30 +00:00
Peter 'Pita' Martischka f85da5483d added a plain text test reporter, will be good for the webdriver client to pick up test results 2012-10-28 13:16:41 +00:00
Peter 'Pita' Martischka c4f38e28a6 CSS 2012-10-27 18:37:33 +01:00
Peter 'Pita' Martischka d7a65e19f4 made it possible to run only certain tests 2012-10-27 17:50:59 +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