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

4260 Commits (cc34f4e325830f798321b8152095c4dccd6b465f)

Author SHA1 Message Date
Stefan cc34f4e325 Merge pull request #2595 from ether/release/1.5.4 
Release 1.5.4
 2015-04-11 10:24:59 +02:00
Stefan 1b9a51c879 Release version 1.5.4 2015-04-11 10:19:02 +02:00
Tom Hunkapiller 0b0a349081 clearer comments about the path handling behavior 2015-04-11 09:05:51 +01:00
Tom Hunkapiller 5409eb314c fix an issue in the path handling that allowed directory traversal 2015-04-11 09:05:32 +01:00
John McLear b95395a130 Merge pull request #2590 from ether/release/1.5.3 
Release/1.5.3
 2015-04-11 00:04:45 +01:00
Stefan d47e201232 Merge branch 'develop' of git://github.com/ether/etherpad-lite into release/1.5.3 2015-04-11 00:49:26 +02:00
John McLear 8f8303415d Merge pull request #2589 from Gared/add_version_number 
Add version number to plugins-info page
 2015-04-10 23:48:52 +01:00
Stefan d3277deafc Increase etherpad version to 1.5.3 2015-04-11 00:32:18 +02:00
Stefan db5bdc8719 Log version number and git-sha on server start 2015-04-11 00:13:04 +02:00
Stefan 8e4c961207 Add version number to plugins-info page 2015-04-10 23:52:17 +02:00
John McLear fc60ddded1 changelog 2015-04-10 22:23:07 +01:00
John McLear 9d4e5f6e35 dont allow directory traversal 2015-04-10 22:02:22 +01:00
John McLear 7b86eb09bc new fix for #1766 2015-04-08 09:24:19 +01:00
John McLear a5345524e1 Merge pull request #2566 from ether/editbar-accessibility 
Accessibility
 2015-04-07 21:25:27 +01:00
John McLear a2e6a1bb4f Merge pull request #2579 from ether/warnings-in-pad-contents 
pass error messages to pad text if shown during startup
 2015-04-07 21:24:47 +01:00
John McLear 7e99724fec Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-06 13:19:42 +01:00
John McLear a5aa58e28b bump ueber 2015-04-06 13:18:44 +01:00
John McLear e0270d0ba8 bump vs 2015-04-06 13:16:21 +01:00
John McLear 3a969f8dd8 pass error messages to pad text if shown during startup 2015-04-06 00:13:38 +01:00
John McLear e027083136 timeslider settings for fonts 2015-04-05 15:18:36 +01:00
John McLear 56ce8e80ac hacky fix for opendyslexic 2015-04-05 14:50:53 +01:00
John McLear 41bb4ef094 support for open dyslexic font 2015-04-05 14:03:09 +01:00
John McLear e49bb4017c use ctrl shift 2 instead of alt a 2015-04-05 13:42:26 +01:00
John McLear db0bcdd696 fix issue where focus on timeslider wouldnt work 2015-04-05 13:39:20 +01:00
John McLear b26956be4b Merge pull request #2576 from rdubigny/develop 
Fix minor typo in installDeps.sh
 2015-04-04 18:06:59 +01:00
Raphaël Dubigny 119fc82387 Update installDeps.sh 2015-04-04 17:30:41 +02:00
Raphaël Dubigny dfd17d1aba Update installDeps.sh 2015-04-04 17:14:59 +02:00
John McLear c65ddad7d6 title for chat 2015-04-03 13:06:03 +01:00
John McLear 9090d76dcf temp solution for alt 9 to show editbar label 2015-04-03 12:33:31 +01:00
John McLear f79e2c7de2 final accessibility for Timeslider hopefully 2015-04-03 12:29:47 +01:00
John McLear 139edceb66 Merge branch 'editbar-accessibility' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-02 16:50:43 +01:00
John McLear 85fc012bac change to alt shit and a to show authors 2015-04-02 15:13:16 +01:00
John McLear 900595355f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2015-04-02 13:17:01 +01:00
John McLear 644536b27b fix for #2574 2015-04-02 13:16:49 +01:00
John McLear ee5833b9c6 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-04-02 00:05:25 +01:00
John McLear f6b4b5603d fix timeslider title issues 2015-04-02 00:03:34 +01:00
John McLear ced2206aa9 Merge pull request #2573 from ether/append-chat-api 
Append chat api -- includes tests.
 2015-04-01 13:58:04 +01:00
John McLear 27ae48686d reintroduce removed api points that were removed by mistake 2015-04-01 13:56:52 +01:00
John McLear 32a09ff461 tests and fix up sloppy code by original author 2015-04-01 13:52:56 +01:00
John McLear c705a058fb Merge branch 'feature/append-chat-api' of github.com:derosm2/etherpad-lite into append-chat-api 2015-04-01 13:32:07 +01:00
John McLear fef746e80e fix import issue with txt files and abiword #2572 2015-04-01 00:19:42 +01:00
John McLear 733deb613e fix font type test 2015-03-31 23:51:40 +01:00
John McLear 0b90da19d2 Merge branch 'develop' of github.com:ether/etherpad-lite into editbar-accessibility 2015-03-31 23:32:15 +01:00
John McLear 70fdc7dcd7 Merge pull request #2423 from ether/fix/reimplement-ace-getAttributeOnSelection 
Re-implement ace_getAttributeOnSelection
 2015-03-31 23:21:49 +01:00
John McLear 8c795b4e8a Merge pull request #2477 from gabrielliwerant/develop-readme-instructions 
Add subdirectory installation instructions
 2015-03-31 23:21:02 +01:00
John McLear b6ff1807da Merge pull request #2482 from ether/chrome-list-handling 
chrome list handling fix for #2412
 2015-03-31 23:19:47 +01:00
John McLear b404af7c17 Merge pull request #2530 from webzwo0i/exception-handling-for-mimatched-composition 
do not crash when encountering mismatched compositions. log the changese...
 2015-03-31 23:17:51 +01:00
John McLear e47992f5b7 Merge pull request #2538 from webzwo0i/check-author-attribution 
Check author attribution and fix clearAuthorship test
 2015-03-31 23:14:22 +01:00
John McLear 64a89a3ec0 Merge pull request #2541 from cristo-rabani/patch-3 
fixed + support for value
 2015-03-31 22:58:10 +01:00
John McLear 4397191f55 Merge pull request #2565 from tm-linkwerk/feature-2558-attributes-on-position 
feature #2558 get attributes on position
 2015-03-31 22:46:00 +01:00