public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,139 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

3139 Commits (9c69753a3570487dd8ac46b81c0a9872450ff7b6)

Author SHA1 Message Date
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
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
John McLear 34c2cf40fa This isn't ideal, basically some browsers interact with keypress/keydown in different ways so this is a workaround but it's not perma 2013-03-14 13:51:23 -03:00
John McLear 12107859bb fix tests in firefox as firefox fires on keypress not down 2013-03-14 13:41:49 -03:00
John McLear f0dee2d2ce Merge pull request #1615 from ether/fix/admin-relative-links 
redirect /admin to /admin/ so that the relative links work
 2013-03-14 08:01:11 -07:00