Commit Graph

185 Commits

Author SHA1 Message Date
4de39ab471 Merge remote-tracking branch 'origin/master' into threedotsonvideohover
# Conflicts:
#	api/src/handlers/Tags.php
#	src/elements/ActorTile/ActorTile.tsx
#	src/elements/Preview/Preview.tsx
#	src/elements/Tag/Tag.tsx
#	src/pages/Player/Player.tsx
2021-03-03 21:40:59 +01:00
8d97ab85a9 Merge branch 'golang_backend' into 'master'
Fully use GO for backend

See merge request lukas/openmediacenter!35
2021-02-23 16:01:30 +00:00
f2b5fb6587 implement full load of videos and startdata
modify api where necessary
2021-02-23 16:01:29 +00:00
2967aee16d Merge branch 'keypropwarnings' into 'master'
fix some required key warnings

See merge request lukas/openmediacenter!34
2021-02-06 22:18:48 +00:00
3c32356227 improve insertion of reindex messages -- prevent empty string lines and add key prop to every new line 2021-02-06 22:18:48 +00:00
b5220634a2 add Tag option to delete tag
fix code style warnings
2021-01-31 17:14:02 +01:00
d59980460f add rightclick context menu events on tags 2021-01-30 21:54:20 +01:00
46aeda73d8 Merge branch 'api_call_enum' into 'master'
add API node type instead of always use string to define api node

See merge request lukas/openmediacenter!33
2021-01-29 22:15:17 +00:00
b6ab359a37 add API node type instead of always use string to define api node 2021-01-29 22:15:17 +00:00
e825f94028 fix #54 2021-01-29 21:39:19 +01:00
fbf286c09c Merge branch 'enter_popup_submit' into 'master'
Shortkeys

See merge request lukas/openmediacenter!31
2021-01-28 19:50:26 +00:00
fa21ba4f25 bind enter events as a submit to Popups
add s as key to submit a reshuffle in shuffled videos
2021-01-28 19:50:26 +00:00
f06da8044f Merge branch 'tat_remove' into 'master'
make tags deleteable

See merge request lukas/openmediacenter!30
2021-01-26 19:14:57 +00:00
ac126f6a9d make tags deleteable
seperate sidebar for each different category page
2021-01-26 19:14:57 +00:00
4e52688ff9 add own class for popup when threedot click 2021-01-26 19:14:47 +01:00
009f21390e Merge remote-tracking branch 'origin/master' into threedotsonvideohover
# Conflicts:
#	src/elements/Preview/Preview.js
2021-01-26 17:38:35 +01:00
d8aee9e5b7 reformat code 2021-01-24 16:43:38 +01:00
fe1a00d1af Merge branch 'full_typescript' into 'master'
typescriptify settings components

See merge request lukas/openmediacenter!29
2021-01-22 21:05:22 +00:00
6c7cc11038 typescriptify Popupbase
focus textfield on filterclick
2021-01-22 21:05:21 +00:00
66eb72d7fb drop support of electron - bad practise to mix website with electron app 2021-01-19 17:27:39 +01:00
0c3f9204bc keep persistent api - databse namings in tests (fixes tests) 2021-01-06 17:53:57 +01:00
4ca590639d add a filter option to the addactor popup page 2021-01-03 21:58:55 +01:00
3e9cb7410f use / as default homepage in package.json 2021-01-01 19:49:18 +01:00
272c88ab50 force index.html - independent of subpath 2020-12-30 18:12:41 +01:00
c4227faf14 Merge branch 'reactrouter' into 'master'
use react router to route through pages

See merge request lukas/openmediacenter!28
2020-12-29 19:39:30 +00:00
80a04456e6 fix some tests
fix merge issues
2020-12-29 19:39:30 +00:00
e11f021efe we need a prepare state because some jobs havent an node env.
use node14 anyways
2020-12-22 18:55:45 +01:00
60b14b3c0d add package-lock.json to project 2020-12-22 18:26:50 +01:00
350471363e new way to initialize npm packages 2020-12-22 17:42:03 +01:00
bce4ec49da no colored cicd -- no coverage 2020-12-21 19:59:30 +00:00
62d3e02645 create three dots on hovering a video tile 2020-12-21 20:48:33 +01:00
4b664d0ae6 correct naming of gitlabci needs 2020-12-18 20:19:32 +01:00
e075a87750 rename gitlab jobs and use only one testing job 2020-12-18 19:55:47 +01:00
866d8f72b4 Merge branch 'electronapp' into 'master'
Electronapp

See merge request lukas/openmediacenter!27
2020-12-17 20:53:22 +00:00
7d696122fa build electron app
implement new fetch api calls
use typescript
2020-12-17 20:53:22 +00:00
c049aa345c Merge branch 'actors_page' into 'master'
Actor Page and Tiles on Player page

Closes #50

See merge request lukas/openmediacenter!23
2020-12-11 18:23:14 +00:00
c5d231d9f2 add style for actor tiles
render actors got from backend
backend test code to get actors
2020-12-11 18:23:13 +00:00
707c54e5f5 Merge branch 'react17plyr3' into 'master'
React17plyr3

See merge request lukas/openmediacenter!26
2020-11-27 22:43:12 +00:00
2d8bb06852 update all but react-scripts (wrong execution of unit tests so they are failing)
fix failing tests because of missing implementation of mount() in enzyme for react 17
2020-11-27 22:43:12 +00:00
2ae00f8af0 release version 0.1.2 2020-11-20 22:00:09 +01:00
9e53b217b0 Merge branch 'spacebetweenvideoactions' into 'master'
improved coloring of videoaction buttons on player page

See merge request lukas/openmediacenter!25
2020-11-20 20:56:51 +00:00
7fbc7e98c9 improved coloring of videoaction buttons on player page 2020-11-20 21:31:07 +01:00
598137ed63 Merge branch 'versionInSettingsPage' into 'master'
Version in settings page

See merge request lukas/openmediacenter!24
2020-11-13 22:52:38 +00:00
bbb36606e1 print settings info as a footer on bottom of settings page
fix display of scrollbar on settingspage
2020-11-13 22:52:38 +00:00
fd692c7c02 run code quality in dind runner 2020-11-12 09:32:46 +00:00
0eb9167deb fix typo and fullfill naming conventions 2020-11-04 23:52:22 +01:00
362484f92c make scandir independent of calldirectory of reindex script
remove log after postinst reindex
2020-10-27 12:48:26 +01:00
a7790b289a use correct magic var in php entry scripts to hold script folder structure independent of call folder
fix php socket location in postinst script
2020-10-26 20:59:48 +01:00
635e9f009c fix right path of extraction script 2020-10-26 20:35:30 +01:00
83227da6da Merge branch 'noredirectonhomepage' into 'master'
no redirect to categorypage - reindex after deb install - no multiply add of same tag possible

See merge request lukas/openmediacenter!21
2020-10-25 18:48:23 +00:00