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

4231 Commits (c65ddad7d6727e9994a32ab2f450e9dd23cfc240)

Author SHA1 Message Date
John McLear c1fdd7ff79 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-12-01 15:10:17 +00:00
John McLear c539cc7d6b styling of global view colum 2014-12-01 15:10:03 +00:00
John McLear b5a0767f32 Merge pull request #2350 from ether/require-kernel-change 
Require kernel change
 2014-11-30 23:30:00 +00:00
John McLear 6fea3a25f8 stop death on no session 2014-11-30 21:21:58 +00:00
John McLear e9686c0d93 Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lite into require-kernel-change 2014-11-29 03:08:42 +00:00
John McLear d7e980cd47 yet more minor css polish 2014-11-29 02:24:19 +00:00
John McLear 12f25d8a45 bump cleancss 2014-11-29 01:31:04 +00:00
John McLear 607c2119a9 Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change 2014-11-29 00:56:18 +00:00
John McLear 71a31a0fc8 Merge branch 'require-kernel-change' of https://github.com/ether/etherpad-lite into require-kernel-change 2014-11-29 00:56:14 +00:00
John McLear ed96c13a1f minor ui polish 2014-11-29 00:54:06 +00:00
John McLear ee585f0457 color picker on mobile actually shows on screen 2014-11-29 00:32:37 +00:00
John McLear 34f7625739 a little more polish 2014-11-29 00:30:13 +00:00
John McLear 53887db872 mobile ui polish 2014-11-29 00:26:25 +00:00
John McLear 3f11b549e9 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-11-28 23:55:17 +00:00
John McLear 74ffbdea79 bump vs 2014-11-28 18:02:11 +00:00
John McLear 3224122f7e correct kernel v# 2014-11-28 17:47:55 +00:00
John McLear 3bf9f3cf1d Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change 2014-11-28 17:43:01 +00:00
John McLear acc6003747 Merge branch 'develop' of https://github.com/ether/etherpad-lite into require-kernel-change 2014-11-28 16:45:06 +00:00
John McLear c6d7ed114e script to update all plugins with one command on CLI 2014-11-28 16:27:12 +00:00
John McLear a642deaa72 gritter css fix 2014-11-28 02:25:21 +00:00
John McLear 68979e1212 better fix 2014-11-28 00:35:46 +00:00
John McLear e6d85bbe69 fix issue with top of chatbox not being aligned properly 2014-11-28 00:26:34 +00:00
John McLear edc5669fa6 Merge pull request #2344 from ether/backend-tests 
Backend tests
 2014-11-28 00:04:12 +00:00
John McLear d974e881a8 Merge branch 'develop' of github.com:ether/etherpad-lite into sanitizer 2014-11-28 00:02:16 +00:00
John McLear 422cfec27a Merge branch 'develop' of github.com:ether/etherpad-lite into require-kernel-change 2014-11-28 00:01:47 +00:00
John McLear 8b787b8d23 readme docs for backend tests 2014-11-27 23:58:50 +00:00
John McLear 936e92e044 fix tests in FF 2014-11-27 23:48:14 +00:00
John McLear d36911da30 fix timeslider tests 2014-11-27 23:36:19 +00:00
John McLear 47029f2e6b diable caret tests for now 2014-11-27 23:10:40 +00:00
John McLear 617514b335 mst tests still brkoen but it runs 2014-11-27 17:12:24 +00:00
John McLear ff58897679 fix frontend tests 2014-11-27 16:58:04 +00:00
John McLear 3ca48ed975 fix undo in chrome etc 2014-11-27 16:49:08 +00:00
John McLear c13301966f yeah need htis too 2014-11-27 02:56:42 +00:00
John McLear 61c6deda2e use a forked require-kernel 2014-11-27 02:44:48 +00:00
John McLear 65fb25d71f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-11-27 02:24:12 +00:00
John McLear 2c728b8e1b sanitizer change 2014-11-27 00:45:22 +00:00
John McLear e51ab2db24 fix for #2132 2014-11-26 23:37:44 +00:00
John McLear fa5130978c path issues for supertitties 2014-11-26 22:10:56 +00:00
John McLear cff8f4a61e remember to add supertest 2014-11-26 21:58:27 +00:00
John McLear e9115880b3 final api test written for now 2014-11-26 21:44:50 +00:00
John McLear 198e211671 4 more to go 2014-11-26 21:36:57 +00:00
John McLear 253d6da2ac 60% of backend api tests written 2014-11-26 21:19:55 +00:00
John McLear 98cc725300 30% of session and group tests done 2014-11-26 21:06:35 +00:00
John McLear f3c2ac6d94 mowah pad tests, tea time 2014-11-26 19:44:38 +00:00
John McLear 5434d2118d tidy up and re-organize 2014-11-26 19:28:49 +00:00
John McLear c0679980bf all pad tests with content 2014-11-26 19:25:09 +00:00
John McLear 1347a814f0 basic pad tests without test logic yet 2014-11-26 17:53:31 +00:00
John McLear 16f3ebb3ba handle auth fails 2014-11-26 17:34:44 +00:00
John McLear 88b3d99fbd Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests 2014-11-26 15:33:13 +00:00
John McLear b4ddeffd04 Merge pull request #2341 from ether/jsdom-go-away 
Use cheerio instead of jsdom
 2014-11-26 15:19:42 +00:00