Docker/flame
Docker/flame
1
0
Fork 0
mirror of https://github.com/pawelmalak/flame.git synced 2025-08-03 01:45:17 +02:00
Code Issues Releases Wiki Activity
191 commits 27 branches 17 tags 4.9 MiB
Commit graph

191 commits

This branch
This branch
All branches
Author SHA1 Message Date
François Darveau
ccdb477ac4 Support for app categories in docker integration (#8) 
* initial support for app categories in docker integration

* fixed readme examples for docker integration and some fixes to integration

* fix obtaining category from container label

* hide edit actions for default categories (such as Docker)
 2021-10-11 11:24:55 -04:00
François Darveau
14fbc7e221 fixes after latest rebase 2021-10-11 11:12:58 -04:00
François Darveau
32bfe33a75 another test 2021-10-11 11:11:20 -04:00
François Darveau
1ff5ac8724 Revert "chnage fork sync to merge instead of rebase" 
This reverts commit 7199a0b1168df98e91d0711698380e537a906330.
 2021-10-11 11:11:20 -04:00
François Darveau
b48a9cedb8 chnage fork sync to merge instead of rebase 2021-10-11 11:11:20 -04:00
François Darveau
0097ae2a77 Add custom icons to bookmarks (#5) 
* allow custom icons for bookmarks

* update docker-image action to tag images based on source branch
 2021-10-11 11:11:20 -04:00
François Darveau
1b57668792 Revert "send email on merge failure" 
This reverts commit 5271e92ab22749cbb70be6a8c7a656d870c069b7.
 2021-10-11 11:11:20 -04:00
François Darveau
3ead1e99c5 send email on merge failure 2021-10-11 11:11:20 -04:00
François Darveau
59b9d20dd5 add github workflow to automatically build a docker image 2021-10-11 11:11:20 -04:00
François Darveau
9698fdc598 add bookmark sorting (#3) 2021-10-11 11:11:19 -04:00
François Darveau
c80e4257ff Add app categories (#2) 
add app categories
 2021-10-11 11:11:19 -04:00
François Darveau
beec2485d5 chnage fork sync to merge instead of rebase 2021-10-11 11:11:19 -04:00
François Darveau
d020fd4c0f Add custom icons to bookmarks (#5) 
* allow custom icons for bookmarks

* update docker-image action to tag images based on source branch
 2021-10-11 11:11:19 -04:00
François Darveau
de51659647 Revert "send email on merge failure" 
This reverts commit 5271e92ab22749cbb70be6a8c7a656d870c069b7.
 2021-10-11 11:11:18 -04:00
François Darveau
5cf0518799 send email on merge failure 2021-10-11 11:11:18 -04:00
François Darveau
50b9eb1b79 fix docker image Github Action 2021-10-11 11:11:18 -04:00
François Darveau
48b61df504 update docker image Github Action for full build and push 2021-10-11 11:11:18 -04:00
François Darveau
605e110509 add bookmark sorting (#3) 2021-10-11 11:11:18 -04:00
François Darveau
504e399fc1 Add app categories (#2) 
add app categories
 2021-10-11 11:11:18 -04:00
François Darveau
83eb42578a back to the original fork sync action 2021-10-11 11:11:17 -04:00
François Darveau
b0408b2d29 fetch all history when syncing fork 2021-10-11 11:11:17 -04:00
François Darveau
7eff483221 another test 2021-10-11 11:11:17 -04:00
François Darveau
dcd97f0d1e test another fork syncing action 2021-10-11 11:11:17 -04:00
François Darveau
530dc26519 Revert "chnage fork sync to merge instead of rebase" 
This reverts commit 7199a0b1168df98e91d0711698380e537a906330.
 2021-10-11 11:11:17 -04:00
François Darveau
48e6c26fb5 chnage fork sync to merge instead of rebase 2021-10-11 11:11:17 -04:00
François Darveau
abd28c4052 Add custom icons to bookmarks (#5) 
* allow custom icons for bookmarks

* update docker-image action to tag images based on source branch
 2021-10-11 11:11:16 -04:00
François Darveau
30d5db79b7 Revert "send email on merge failure" 
This reverts commit 5271e92ab22749cbb70be6a8c7a656d870c069b7.
 2021-10-11 11:11:16 -04:00
François Darveau
79fc59da06 send email on merge failure 2021-10-11 11:11:16 -04:00
François Darveau
3120c60f7b add github workflow to automatically build a docker image 2021-10-11 11:11:16 -04:00
François Darveau
8fab9bc06c add bookmark sorting (#3) 2021-10-11 11:11:16 -04:00
François Darveau
2530f2d089 Add app categories (#2) 
add app categories
 2021-10-11 11:11:15 -04:00
François Darveau
74e3cbc7e2 chnage fork sync to merge instead of rebase 2021-10-11 11:11:15 -04:00
François Darveau
a4b9887c68 add default values for database migration purposes 2021-10-11 11:11:15 -04:00
François Darveau
e8c1567bc5 remove Dockerfile comments 2021-10-11 11:11:15 -04:00
François Darveau
d60dc5cc31 optimize Dockerfile cache use for client build 2021-10-11 11:11:15 -04:00
François Darveau
122ace346d fix docker-image branch tag comparison 2021-10-11 11:11:15 -04:00
François Darveau
c0d3ea2c4a Add custom icons to bookmarks (#5) 
* allow custom icons for bookmarks

* update docker-image action to tag images based on source branch
 2021-10-11 11:11:12 -04:00
François Darveau
28ea50676a Revert "send email on merge failure" 
This reverts commit 5271e92ab22749cbb70be6a8c7a656d870c069b7.
 2021-10-11 11:10:25 -04:00
François Darveau
6daad824cf send email on merge failure 2021-10-11 11:10:25 -04:00
François Darveau
a05a046328 fix docker image Github Action 2021-10-11 11:10:25 -04:00
François Darveau
671fc028dd fix docker image tag name 2021-10-11 11:10:25 -04:00
François Darveau
b64a452411 update docker image Github Action for full build and push 2021-10-11 11:10:25 -04:00
François Darveau
2593a63e25 add github workflow to automatically build a docker image 2021-10-11 11:10:25 -04:00
François Darveau
2c659d1e51 add bookmark sorting (#3) 2021-10-11 11:10:22 -04:00
François Darveau
31cf2bc5ad Add app categories (#0) 
add app categories
 2021-10-11 11:00:22 -04:00
pawelmalak
6f44200a3c
Merge pull request #114 from pawelmalak/v1.7.0 
Version 1.7.0
 2021-10-11 16:10:35 +02:00
Paweł Malak
7129fe83da Fixed bug with fetching config. Pushed version 1.7.0 2021-10-11 15:15:26 +02:00
pawelmalak
6f8a017bfb
Merge pull request #109 from pa-sowa/docker-user-icon-fix 
Don't override user selected icon of a docker app
 2021-10-11 15:03:47 +02:00
Paweł Malak
55f192f664 Merge branch 'feature' into v1.7.0 2021-10-11 14:31:59 +02:00
unknown
edb04c375f Prevent deleting active search provider 2021-10-11 14:05:53 +02:00