Commit Graph

2940 Commits (feature/message-domains)

Author SHA1 Message Date
Marcel Klehr 0a468e92b6 Use a node domain per message to stabilize the server 2013-03-23 22:22:14 +01:00
Siebrand Mazeland 35e4891217 Localisation updates from http://translatewiki.net. 2013-03-23 13:26:38 +00:00
Marcel Klehr 5ede02ffb7 Merge pull request #1656 from ether/cookies
fix cookies
2013-03-23 04:08:27 -07:00
John McLear 0063933041 fix cookies 2013-03-23 02:59:12 +00:00
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 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
Marcel Klehr cb45c44b4d Merge pull request #1588 from disy-mk/patch-2
fix #1586
2013-03-19 08:47:26 -07: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 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
Siebrand Mazeland 83ed9303da Localisation updates from http://translatewiki.net. 2013-03-18 00:43:57 +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
Marcel Klehr a31605216f Merge branch 'release/1.2.9' 2013-03-15 21:43:58 +01:00
Marcel Klehr 54433db47f release v1.2.9 2013-03-15 21:43:29 +01:00
Marcel Klehr 84d44d5f0e Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesets
Fix clearing authorship colors which was broken by #1609
2013-03-15 12:20:31 -07:00
Marcel Klehr de552df6db Fix clearing authorship colors which was broken by #1609
Fixes #1620
2013-03-15 18:08:51 +01:00
John McLear cf041dcb08 Merge pull request #1618 from ether/tidy-up
Tidy up
2013-03-14 14:32:13 -07:00
John McLear 5d12be940c return text instead of html 2013-03-14 18:28:35 -03:00
John McLear 383439629a specialkey doesnt even exist afaik 2013-03-14 18:27:32 -03:00
John McLear 1bb9d1d625 remove pointless + 2013-03-14 18:23:27 -03:00
John McLear 019b25daa2 Merge pull request #1617 from ether/replace-html-with-text
escape .color
2013-03-14 14:20:43 -07:00
John McLear d72abceee7 escape .color 2013-03-14 18:18:14 -03:00
John McLear dab82ca380 Merge pull request #1616 from ether/ff-key-tests
fix tests in firefox as firefox fires on keypress not down
2013-03-14 13:34:22 -07:00
John McLear 29c0d790b5 fix undo test 2013-03-14 14:48:23 -03:00
John McLear 24188d7007 this should pass more tests.. 2013-03-14 14:36:54 -03:00
John McLear 1462d8e80c now IE friendly 2013-03-14 14:22:58 -03:00
John McLear 6bac01009b missed an evt 2013-03-14 13:52:20 -03:00