aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release/v1.3.0' into developChocobozzz2019-05-220-0/+0
|\
| * Bumped to version v1.3.0-rc.2v1.3.0-rc.2Chocobozzz2019-05-223-3/+3
| * Update changelogChocobozzz2019-05-211-7/+25
* | Bumped to version v1.3.0-rc.2Chocobozzz2019-05-223-3/+3
* | Update changelogChocobozzz2019-05-221-7/+25
* | Fix docker-compose setup so Peertube sees correct IPFelix Ableitner2019-05-212-2/+8
* | Merge branch 'release/v1.3.0' into developChocobozzz2019-05-214-29/+79
|\|
| * Fix video viewsChocobozzz2019-05-213-4/+38
| * Fix blacklist sortChocobozzz2019-05-211-25/+41
* | Merge branch 'release/v1.3.0' into developChocobozzz2019-05-217-20/+27
|\|
| * Fix thumbnails in video blacklist list endpointChocobozzz2019-05-211-2/+2
| * Fix pagination in my videos pageChocobozzz2019-05-216-18/+25
* | Merge branch 'feature/audio-upload' into developChocobozzz2019-05-2161-292/+646
|\ \
| * | Fix icon color on audio uploadChocobozzz2019-05-211-0/+5
| * | Fix OGG bug with firefoxChocobozzz2019-05-211-1/+12
| * | Update travis ffmpeg patch versionChocobozzz2019-05-176-6/+10
| * | Add audio upload testsChocobozzz2019-05-1713-22/+109
| * | Support audio upload in clientChocobozzz2019-05-1719-107/+192
| * | Add audio support in uploadChocobozzz2019-05-1627-162/+324
* | | Merge branch 'release/v1.3.0' into developChocobozzz2019-05-216-34/+65
|\ \ \ | | |/ | |/|
| * | Relax activity validationChocobozzz2019-05-211-12/+13
| * | Fix reordering playlistChocobozzz2019-05-171-1/+3
| * | Reset playlist add component when video changesChocobozzz2019-05-173-21/+48
| * | Fix playlist block with theater playerChocobozzz2019-05-171-0/+1
* | | Allow to control emails prefix and signature with config (#1789)Yohan Boniface2019-05-173-33/+47
| |/ |/|
* | Add way to set root password by environment.Axel Viala2019-05-162-0/+5
* | fix: Close modal after clicking on downloadLeo Mouyna2019-05-161-4/+4
* | transcode in STORAGE.TMP_DIR for s3fs compatibility (#147)libertysoft32019-05-161-6/+12
* | Merge remote-tracking branch 'origin/pr/1785' into developChocobozzz2019-05-163-10/+72
|\ \
| * | Added comments for transcode functionsFelix Ableitner2019-05-131-0/+6
| * | fixed formatting, added test caseFelix Ableitner2019-05-043-12/+32
| * | Dont transcode videos when it is not required (fixes #1780)Felix Ableitner2019-05-042-9/+52
* | | Merge branch 'feature/parallel-tests' into developChocobozzz2019-05-1652-437/+611
|\ \ \ | |_|/ |/| |
| * | Don't use parallel tests with test suite 1 and 3Chocobozzz2019-05-152-2/+2
| * | Decrease max parallel tests for travisChocobozzz2019-05-155-8/+8
| * | All API tests in parallelChocobozzz2019-05-1534-222/+286
| * | Redundancy and search tests in parallel tooChocobozzz2019-05-1425-222/+249
| * | Try parallel check params testsChocobozzz2019-05-149-9/+92
* | | Remove unnecessary CSS in menuChocobozzz2019-05-151-3/+0
* | | Merge branch 'master' into developChocobozzz2019-05-151-0/+3
|\ \ \ | |/ / |/| |
| * | Merge branch 'release/v1.2.0'Chocobozzz2019-02-1417-99/+170
| |\ \
| | * | Bumped to version v1.2.1v1.2.1Chocobozzz2019-02-143-3/+3
| | * | Update changelogChocobozzz2019-02-141-0/+12
| | * | Fix mention helper testChocobozzz2019-02-141-0/+2
| | * | Fix from header in contact formChocobozzz2019-02-144-9/+25
| | * | Fix too long name in menuChocobozzz2019-02-142-4/+7
| | * | Fix mention notification with a remote accountChocobozzz2019-02-143-15/+41
| | * | Fix moderators that cannot access the muted servers tableChocobozzz2019-02-141-1/+1
| | * | Don't crash on error in notification popupChocobozzz2019-02-141-67/+73
| | * | Error on invalid password in reset password scriptChocobozzz2019-02-141-0/+6