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

2149 Commits

Author SHA1 Message Date
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
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 06bebf257e run all tests 2012-10-27 16:40:54 +01:00
Peter 'Pita' Martischka a2a208a95b Merge branch 'clear-authorship-color-test-spec' of git://github.com/johnyma22/etherpad-lite into feature/frontend-tests 2012-10-27 16:33:34 +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
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