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

3106 Commits

Author SHA1 Message Date
John McLear 73afc595e5 Merge pull request #1655 from simong/cassandra 
Bumped the ueberDB package version to 0.1.96 to add in Cassandra support
 2013-03-22 08:24:34 -07:00
Simon Gaeremynck cbde18945c Bumped the ueberDB package version to 0.1.96 to add in Cassandra support. 2013-03-22 15:22:17 +00:00
John McLear 2c34f6673c Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop 2013-03-21 18:49:03 -07:00
John McLear 1bf9d53f6a Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop 2013-03-21 16:47:37 -07:00
John McLear 09edfb0d5e Merge pull request #1649 from sahilamoli/FirefoxFixForLineBreaks 
Issue #1648 - Long lines without any spaces don't wrap on Firefox
 2013-03-20 16:36:10 -07:00
Sahil Amoli 23abafb3cb Issue #1648 - Long lines without any spaces don't wrap on Firefox, the text ends up going off screen 2013-03-20 15:48:11 -07:00
John McLear d40a64893c Merge pull request #1633 from ether/mobile-msg-css 
better mobile support for gritter messages, before it was awful
 2013-03-19 18:17:31 -07:00
John McLear 2a1859cc6d mm k 2013-03-20 01:14:04 +00:00
John McLear 4ea7ccd104 merge develop 2013-03-20 01:11:27 +00:00
John McLear 9d14c3708d Merge pull request #1644 from ether/chatMsgHook 
hook for chat msg
 2013-03-19 18:10:31 -07:00
Marcel Klehr bcb92f25a6 Refactor chat notifications and the chatNewMessage hook 2013-03-19 20:21:27 +01:00
John McLear 588fd399cd Merge pull request #1645 from ether/fix/import-without-files 
Don't break the whole server if an import failed because no files were u...
 2013-03-19 10:41:32 -07:00
Marcel Klehr c30697cb07 Don't break the whole server if an import failed because no files were uploaded 
Fixes #1611
 2013-03-19 18:40:39 +01:00
John McLear 5e07f24c69 Merge pull request #1646 from ether/feature/log-http-on-debug-level 
Log http on debug log level
 2013-03-19 10:39:15 -07:00
Marcel Klehr a628317b55 Log http on debug log level 
... and additionally log the response time
 2013-03-19 18:34:21 +01:00
John McLear a9bd081a44 more clean up 2013-03-19 16:55:42 +00:00
John McLear 9bb0587447 working and jsonify obj 2013-03-19 16:40:51 +00:00
John McLear 2916b39c24 make sure the sessionID target is right 2013-03-19 16:21:04 +00:00
Marcel Klehr cb45c44b4d Merge pull request #1588 from disy-mk/patch-2 
fix #1586
 2013-03-19 08:47:26 -07:00
John McLear d0e656d0a6 Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg 2013-03-19 13:59:07 +00:00
John McLear 11341eb095 add a test to show weird behavior 2013-03-19 12:52:14 +00:00
John McLear 8406cc95ab docs for hook 2013-03-19 03:43:38 +00:00
John McLear 7741f762e2 hook for chat msg 2013-03-19 02:21:53 +00:00
John McLear 13ee96dce0 more tests but still fundamental flaw with arrow keys 2013-03-18 22:14:41 +00:00
John McLear ee6a7d0b0c most test pass but important ones failed 2013-03-18 22:09:51 +00:00
John McLear 07adb45503 Merge pull request #1643 from ether/fix/html10n-update 
Update html10n.js
 2013-03-18 14:38:22 -07:00
John McLear e49620ea07 update ueber for pg 2013-03-18 21:36:50 +00:00
Marcel Klehr b3dbf1c995 Update html10n.js 2013-03-18 22:29:42 +01:00
John McLear 65e51473bc Merge pull request #1642 from ether/fix/import 
Fix #1639 by removing bodyParser middleware introduced with swagger REST...
 2013-03-18 14:12:09 -07:00
Marcel Klehr 2bc45de106 Fix #1639 by removing bodyParser middleware introduced with swagger REST API 2013-03-18 22:09:47 +01:00
John McLear fb9d46fc51 document the required tests 2013-03-18 20:08:58 +00:00
John McLear 3562672a75 stop start point going negative 2013-03-18 18:44:01 +00:00
John McLear 27e9f91864 page up, down etc all working, still no shift page up/down for highlight but that never worked anyways 2013-03-18 18:03:37 +00:00
John McLear 9f54a65c88 refactored arrow keys now work after paste in chrome 2013-03-18 17:40:18 +00:00
Siebrand Mazeland 83ed9303da Localisation updates from http://translatewiki.net. 2013-03-18 00:43:57 +00:00
John McLear 99ac407f08 working caret position function 2013-03-17 23:16:23 +00:00
John McLear 81f0ef73ab beginning of FE tests for caret tracking which is easily broken when you add weird line heights to pads 2013-03-17 22:15:18 +00:00
John McLear f238ba2f26 Merge pull request #1636 from maixithn/patch-1 
Update README.md
 2013-03-17 14:25:44 -07:00
maixithn b084cf4f28 Update README.md 2013-03-17 21:57:14 +01:00
John McLear 3e0a80cb74 remove console log 2013-03-17 15:17:36 +00:00
John McLear 693b9b9b94 better mobile support for gritter messages, before it was awful 2013-03-17 01:23:31 +00:00
John McLear 755965d904 Merge pull request #1632 from ether/enable-buttons-reconnect 
Enable buttons reconnect
 2013-03-16 10:58:27 -07:00
John McLear a1d9d27cde much cleaner way of showing / hiding overlay 2013-03-16 17:57:23 +00:00
John McLear 69a4ab76cf hide modal once reconnect is good 2013-03-16 17:50:53 +00:00
John McLear d26660bce1 Merge pull request #1629 from accolade/patch-1 
(( 2 typos
 2013-03-16 09:16:51 -07:00
accolade f972d2a92d (( 2 typos 2013-03-16 17:05:23 +01:00
John McLear 13ad46aa67 a safer approach I think but still be careful 2013-03-16 13:19:12 +00:00
Marcel Klehr cd9c78998e Fix path.join in Settings.js 2013-03-16 09:47:10 +01:00
Marcel Klehr 5a9393d5da Update version checks 2013-03-16 09:46:35 +01:00
Marcel Klehr a31605216f Merge branch 'release/1.2.9' 2013-03-15 21:43:58 +01:00