1
0
Fork 0
mirror of https://github.com/pawelmalak/flame.git synced 2025-07-24 13:39:35 +02:00
Commit graph

78 commits

Author SHA1 Message Date
François Darveau
4c827d2c91 Merge branch 'master' of https://github.com/pawelmalak/flame 2022-04-15 14:40:47 -04:00
Paweł Malak
ad92de141b API routes to edit and delete custom themes. Added ThemeEditor table 2022-03-25 11:33:42 +01:00
Paweł Malak
b8af178cbf API routes to get and add themes 2022-03-24 14:48:10 +01:00
Paweł Malak
e427fbf54c Added theme string normalization to initial process. Added getThemes controller 2022-03-23 14:13:14 +01:00
François Darveau
e7cd4d7705 fix integrations 2021-12-08 17:33:30 -05:00
François Darveau
e5154576b4 attempt to fix integrations 2021-12-07 23:23:57 -05:00
François Darveau
5474fe324f load apps when retrieving categories in order to create docker and kubernetes apps beforehand 2021-12-07 17:21:59 -05:00
François Darveau
021bd4e85a Merge branch 'master' of https://github.com/pawelmalak/flame into merge_upstream_2020-12-06 2021-12-06 22:29:22 -05:00
Paweł Malak
d5610ad6be Fixed bug with alphabetical order not working for bookmarks. Minor changes related to bookmarks form 2021-11-26 14:04:46 +01:00
Paweł Malak
f1f7b698f8 Db migration to support custom order of bookmarks. Created route to reorder bookmarks. Added more sorting options to bookmark controllers. Simplified ordering in getAllApps controller 2021-11-22 16:45:59 +01:00
Paweł Malak
426766225b Fixed bug with custom icons not working with apps 2021-11-18 13:05:32 +01:00
pawelmalak
1220c56fc5
Fixed bug with adding new apps with custom icon (#180)
* Bump url-parse from 1.5.1 to 1.5.3 in /client

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump dns-packet from 1.3.1 to 1.3.4 in /client

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

---
updated-dependencies:
- dependency-name: dns-packet
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump ws from 6.2.1 to 6.2.2 in /client

Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/6.2.1...6.2.2)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fixed #177

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-11-15 16:34:12 +01:00
Paweł Malak
6281994be8 Trim icon name. Filter private bookmarks if user is not authenticated 2021-11-12 13:09:33 +01:00
Paweł Malak
0d36c5cf94 Backend: auth for bookmarks and categories 2021-11-11 16:43:00 +01:00
Paweł Malak
22471d64c7 Backend: auth for config and queries. Refactor of middleware exports 2021-11-11 16:18:31 +01:00
Paweł Malak
e3f167921c Added auth middleware. Added access control to apps 2021-11-11 16:01:56 +01:00
Paweł Malak
5805c708d2 Added login route and token signing 2021-11-10 16:14:22 +01:00
Paweł Malak
4ed29fe276 Split remaining controllers into separate files. Added iOS homescreen icon. Removed additional logging from weather module. 2021-11-04 23:39:35 +01:00
Paweł Malak
88694c7e27 Fixed bug with custom css not updating 2021-10-28 16:05:21 +02:00
Paweł Malak
4ef9652ede Added option to change date formatting. Added shortcuts to clear search bar 2021-10-22 15:51:11 +02:00
Paweł Malak
cfb471e578 Changed config api. Split config controllers into separate files. Split bookmarks controllers into separate files 2021-10-22 14:00:38 +02:00
Paweł Malak
34279c8b8c Split apps controllers into separate files 2021-10-22 00:42:27 +02:00
pawelmalak
85ee5da025
Merge pull request #112 from pa-sowa/traefik
Support traefik labels for URL configuration
2021-10-21 13:40:10 +02:00
François Darveau
349d63c3e3 automatically create new category when category in integrations is not found (#11)
automatically create new category when category in docker or kubernetes labels is not found
2021-10-11 11:46:25 -04:00
François Darveau
21aabf7267 fix default categories nesting 2021-10-11 11:44:32 -04:00
François Darveau
55b32f9ce9 actually filter categories by type when querying 2021-10-11 11:44:30 -04:00
François Darveau
64a9dabdd6 filter categories in server instead of the client and small fixes following latest rebase 2021-10-11 11:43:39 -04:00
François Darveau
cb794daf73 update default order ID for docker and kubernetes apps to allow custom order before apps without the order attribute 2021-10-11 11:41:12 -04:00
François Darveau
064ec83c12 update kubernetes integration to match changes to docker integration in this fork 2021-10-11 11:39:17 -04:00
François Darveau
e07159e952 add 'order' flame label for docker integration (#9) 2021-10-11 11:25:53 -04:00
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
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
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
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
38ffdf1bff Add and update custom queries 2021-10-11 13:55:53 +02:00
unknown
a885440fef Add and delete custom search provider actions and controllers 2021-10-11 13:03:31 +02:00
Przemysław Adam Sowa
16341ca6da Support traefik labels for URL configuration 2021-10-10 13:06:48 +02:00
unknown
63346f7e38 Pushed version 1.6.9 2021-10-09 23:12:26 +02:00
Przemysław Adam Sowa
04be0d1316 Don't override user selected icon of a docker app 2021-10-09 12:57:14 +02:00
Pablo Ruiz
231dbc4577 Added remote docker host 2021-10-06 22:17:43 +02:00
unknown
591824dd0c Fetch and use custom search queries 2021-10-06 14:15:05 +02:00
unknown
1625932e52 Fix for #96 2021-10-04 16:15:17 +02:00
unknown
6a6f1750b1 Pushed version 1.6.7 2021-10-04 12:11:41 +02:00
Pablo Ruiz
9606978bd7 Add custom icon & multiple apps support to Docker API 2021-09-29 22:26:12 +02:00
Dimitri Pommier
8681f75bab
Kubernetes integration (#80)
* chore(): skaffold

* chore(): kubernetes integration

* chore(skaffold): refine shokohsc profile

* chore(): removed docker & kubernetes from database + stoppedApp pin option

* Revert "chore(): removed docker & kubernetes from database + stoppedApp pin option"

This reverts commit 5111c7ad79.
2021-08-17 10:32:15 +02:00
unknown
1699146f79 Added support for custom SVG icons 2021-08-06 15:15:54 +02:00