Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release/v1.3.0' into develop | Chocobozzz | 2019-05-21 | 4 | -29/+79 |
|\ | |||||
| * | Fix video views | Chocobozzz | 2019-05-21 | 3 | -4/+38 |
| | | |||||
| * | Fix blacklist sort | Chocobozzz | 2019-05-21 | 1 | -25/+41 |
| | | |||||
* | | Merge branch 'release/v1.3.0' into develop | Chocobozzz | 2019-05-21 | 7 | -20/+27 |
|\| | |||||
| * | Fix thumbnails in video blacklist list endpoint | Chocobozzz | 2019-05-21 | 1 | -2/+2 |
| | | |||||
| * | Fix pagination in my videos page | Chocobozzz | 2019-05-21 | 6 | -18/+25 |
| | | |||||
* | | Merge branch 'feature/audio-upload' into develop | Chocobozzz | 2019-05-21 | 61 | -292/+646 |
|\ \ | |||||
| * | | Fix icon color on audio upload | Chocobozzz | 2019-05-21 | 1 | -0/+5 |
| | | | |||||
| * | | Fix OGG bug with firefox | Chocobozzz | 2019-05-21 | 1 | -1/+12 |
| | | | |||||
| * | | Update travis ffmpeg patch version | Chocobozzz | 2019-05-17 | 6 | -6/+10 |
| | | | |||||
| * | | Add audio upload tests | Chocobozzz | 2019-05-17 | 13 | -22/+109 |
| | | | |||||
| * | | Support audio upload in client | Chocobozzz | 2019-05-17 | 19 | -107/+192 |
| | | | |||||
| * | | Add audio support in upload | Chocobozzz | 2019-05-16 | 27 | -162/+324 |
| | | | |||||
* | | | Merge branch 'release/v1.3.0' into develop | Chocobozzz | 2019-05-21 | 6 | -34/+65 |
|\ \ \ | | |/ | |/| | |||||
| * | | Relax activity validation | Chocobozzz | 2019-05-21 | 1 | -12/+13 |
| | | | |||||
| * | | Fix reordering playlist | Chocobozzz | 2019-05-17 | 1 | -1/+3 |
| | | | |||||
| * | | Reset playlist add component when video changes | Chocobozzz | 2019-05-17 | 3 | -21/+48 |
| | | | |||||
| * | | Fix playlist block with theater player | Chocobozzz | 2019-05-17 | 1 | -0/+1 |
| | | | |||||
* | | | Allow to control emails prefix and signature with config (#1789) | Yohan Boniface | 2019-05-17 | 3 | -33/+47 |
| |/ |/| | | | | | | | | | * Allow to control emails prefix and signature with config * Adapt email config according to @Chocobozzz review | ||||
* | | Add way to set root password by environment. | Axel Viala | 2019-05-16 | 2 | -0/+5 |
| | | | | | | | | | | Add a condition test to pass by environment a predetermined root password for setting up. | ||||
* | | fix: Close modal after clicking on download | Leo Mouyna | 2019-05-16 | 1 | -4/+4 |
| | | | | | | | | | | | | | | Use the NgActiveModal method to close it on a click by adding a specific modalActive object and use it on download function. See issue: Chocobozzz#1436 | ||||
* | | transcode in STORAGE.TMP_DIR for s3fs compatibility (#147) | libertysoft3 | 2019-05-16 | 1 | -6/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/pr/1785' into develop | Chocobozzz | 2019-05-16 | 3 | -10/+72 |
|\ \ | |||||
| * | | Added comments for transcode functions | Felix Ableitner | 2019-05-13 | 1 | -0/+6 |
| | | | |||||
| * | | fixed formatting, added test case | Felix Ableitner | 2019-05-04 | 3 | -12/+32 |
| | | | |||||
| * | | Dont transcode videos when it is not required (fixes #1780) | Felix Ableitner | 2019-05-04 | 2 | -9/+52 |
| | | | |||||
* | | | Merge branch 'feature/parallel-tests' into develop | Chocobozzz | 2019-05-16 | 52 | -437/+611 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Don't use parallel tests with test suite 1 and 3 | Chocobozzz | 2019-05-15 | 2 | -2/+2 |
| | | | |||||
| * | | Decrease max parallel tests for travis | Chocobozzz | 2019-05-15 | 5 | -8/+8 |
| | | | |||||
| * | | All API tests in parallel | Chocobozzz | 2019-05-15 | 34 | -222/+286 |
| | | | |||||
| * | | Redundancy and search tests in parallel too | Chocobozzz | 2019-05-14 | 25 | -222/+249 |
| | | | |||||
| * | | Try parallel check params tests | Chocobozzz | 2019-05-14 | 9 | -9/+92 |
| | | | |||||
* | | | Remove unnecessary CSS in menu | Chocobozzz | 2019-05-15 | 1 | -3/+0 |
| | | | |||||
* | | | Merge branch 'master' into develop | Chocobozzz | 2019-05-15 | 1 | -0/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'release/v1.2.0' | Chocobozzz | 2019-02-14 | 17 | -99/+170 |
| |\ \ | |||||
| | * | | Bumped to version v1.2.1v1.2.1 | Chocobozzz | 2019-02-14 | 3 | -3/+3 |
| | | | | |||||
| | * | | Update changelog | Chocobozzz | 2019-02-14 | 1 | -0/+12 |
| | | | | |||||
| | * | | Fix mention helper test | Chocobozzz | 2019-02-14 | 1 | -0/+2 |
| | | | | |||||
| | * | | Fix from header in contact form | Chocobozzz | 2019-02-14 | 4 | -9/+25 |
| | | | | |||||
| | * | | Fix too long name in menu | Chocobozzz | 2019-02-14 | 2 | -4/+7 |
| | | | | |||||
| | * | | Fix mention notification with a remote account | Chocobozzz | 2019-02-14 | 3 | -15/+41 |
| | | | | |||||
| | * | | Fix moderators that cannot access the muted servers table | Chocobozzz | 2019-02-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Don't crash on error in notification popup | Chocobozzz | 2019-02-14 | 1 | -67/+73 |
| | | | | |||||
| | * | | Error on invalid password in reset password script | Chocobozzz | 2019-02-14 | 1 | -0/+6 |
| | | | | |||||
| * | | | Merge branch 'release/v1.2.0' | Chocobozzz | 2019-02-06 | 631 | -12499/+25925 |
| |\| | | |||||
| * | | | Fix adding captions to a video | Chocobozzz | 2018-12-17 | 1 | -3/+1 |
| | | | | |||||
* | | | | Changelog typo | Chocobozzz | 2019-05-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | Bumped to version v1.3.0-rc.1v1.3.0-rc.1 | Chocobozzz | 2019-05-14 | 3 | -3/+3 |
| | | | | |||||
* | | | | Fix e2e tests | Chocobozzz | 2019-05-14 | 3 | -2/+3 |
| | | | | |||||
* | | | | Use HLS by default if enabled | Chocobozzz | 2019-05-14 | 2 | -1/+13 |
| | | | |