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

4114 Commits (4166f190780f196a24248ec2733e97d7c0ba76ec)

Author SHA1 Message Date
John McLear 1fd7574cfb Merge pull request #2445 from webzwo0i/fix-importexport 
fix importexport-tests
 2015-01-07 14:22:25 +00:00
webzwo0i ce156540ba fix importexport-tests 2015-01-07 07:03:53 +01:00
John McLear 5dd64dfc77 Merge pull request #2443 from ether/exporthtmlendhook 
final html export hook
 2015-01-06 17:40:25 +00:00
John McLear 17ce67d936 final html export hook 2015-01-06 16:31:52 +00:00
Marcel Klehr 751adb24fd Finally fix AttribManager#removeAttributeOnLine 
return safely if the attribute wasn't found.
fixes #2394
 2015-01-05 18:38:34 +01:00
John McLear 2e2dd688e9 Merge pull request #2436 from ether/check-for-abiword-path 
check file system that abiword exists
 2015-01-05 17:14:43 +00:00
John McLear 26c839063f check file system that abiword exists 2015-01-04 14:47:08 +00:00
Siebrand Mazeland e2ea82f8df Localisation updates from https://translatewiki.net. 2015-01-02 10:58:48 +01:00
John McLear 230302b132 fix timeslider stars and frontend tests, needs css polish 2015-01-01 22:40:45 +00:00
John McLear be4782ae07 Merge pull request #2425 from ether/master 
Merge pull request #2424 from ether/release/1.5.0
 2015-01-01 17:25:24 +00:00
John McLear cbfc8330cc Merge pull request #2424 from ether/release/1.5.0 
Release/1.5.0
 2015-01-01 17:25:03 +00:00
John McLear 95af55992a changelog 2015-01-01 17:13:50 +00:00
John McLear 45e90e138c v number bump 2015-01-01 16:57:31 +00:00
John McLear 8eb723b906 patch for e1c683be3f 2014-12-31 14:16:10 +00:00
John McLear 036b7d2890 Merge pull request #2418 from ether/etherpad-export-and-import 
Full Pad portability (Export/Import)
 2014-12-31 13:32:09 +00:00
John McLear 4b6df17e99 Merge pull request #2421 from webzwo0i/fix-swagger 
hack to avoid warnings in swagger usage
 2014-12-31 13:27:00 +00:00
John McLear 83f62bb6a9 remove console log 2014-12-31 13:21:36 +00:00
John McLear b5c671a9b6 Merge pull request #2420 from ether/fix/clean-up-after-removing-list-attrs 
Clean-up after removing list attribute: Remove list numbering attribute
 2014-12-31 13:19:24 +00:00
John McLear 335bf3dc4a more line polish 2014-12-31 01:46:53 +00:00
John McLear 01c667aa2e export html more styles 2014-12-31 00:53:20 +00:00
webzwo0i b0da214ad5 hack to avoid warnings in swagger usage 2014-12-30 18:06:41 +01:00
Marcel Klehr cfe75c7f3f Clean-up after removing list attribute: Remove list numbering attribute 2014-12-30 17:45:26 +01:00
Stefan c20a7e9bce Merge pull request #2406 from Gared/fix/author-not-set-callback 
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
 2014-12-30 14:55:49 +01:00
Stefan 5df638bfac Merge pull request #2410 from Gared/feature/notify-user-cookies-rejected 
Notify user if cookies can't be created
 2014-12-30 14:54:43 +01:00
John McLear 90e83ed6b5 more styling 2014-12-30 14:53:44 +01:00
John McLear 716b1c6113 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2014-12-30 14:44:55 +01:00
John McLear 16713d8b3b some demo export loic for handling OL incrementation 2014-12-30 14:43:00 +01:00
John McLear 4687d226c6 Merge pull request #2417 from webzwo0i/fix-export 
Fix ExportHtml.js list parsing code
 2014-12-30 13:47:31 +01:00
John McLear 19c78212e8 Merge pull request #2405 from webzwo0i/fix-lineassembler-not-finished 
Fix lineassembler not finished
 2014-12-30 12:19:04 +01:00
John McLear a07d1722fc no errors on chrome client 2014-12-30 12:12:24 +01:00
John McLear 5ba3cab445 better take some responsibility 2014-12-30 00:13:01 +01:00
John McLear ac4f9eb4ce licensing 2014-12-30 00:12:26 +01:00
John McLear 99a239fa9a remove console log 2014-12-30 00:10:08 +01:00
John McLear 0676d2fe24 working author import 2014-12-30 00:01:15 +01:00
John McLear b8648b4a49 remove error logging 2014-12-29 23:08:42 +01:00
John McLear 1e0de620be more author logic 2014-12-29 23:08:17 +01:00
John McLear ec2b844f94 authors 2014-12-29 22:51:31 +01:00
John McLear a2262c56b9 msg for user 2014-12-29 22:05:14 +01:00
John McLear a6400b3f61 allow only for pads less than 10 to be overwritten 2014-12-29 22:02:24 +01:00
John McLear ab5e7381a2 working for all files 2014-12-29 21:35:10 +01:00
John McLear 1081156f13 whoopsi, required files 2014-12-29 21:13:49 +01:00
John McLear 7980381369 better test coverage for longer pad data 2014-12-29 21:13:07 +01:00
John McLear 3773b6346b semi working requires browser refresh 2014-12-29 20:57:58 +01:00
webzwo0i 6e4e034e42 fix closing of lists 2014-12-29 16:27:40 +01:00
John McLear cd944a356d Merge pull request #2416 from webzwo0i/fix-import-of-indented-lists 
Fix import of indented lists
 2014-12-29 16:25:51 +01:00
webzwo0i 8e280f46c1 fix bullet test case, remove indent-testcases because they are in separate file 2014-12-29 16:25:41 +01:00
webzwo0i a36d6f36a0 add testcase for import of intended lists 2014-12-29 16:12:46 +01:00
webzwo0i e1c683be3f differentiate between indents and bullets in unordered lists 2014-12-29 16:12:07 +01:00
John McLear 565097efb4 Merge pull request #2415 from ether/write-delay 
delay write to fix copypad -- bad practice but due to db.set not allowin...
 2014-12-29 15:10:49 +01:00
John McLear c9b0c6896e move pad tests - still need to do copy pad and some other functionality IE force 2014-12-29 15:08:30 +01:00