Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge upstream changes #139

Draft
wants to merge 87 commits into
base: preview
Choose a base branch
from
Draft

Merge upstream changes #139

wants to merge 87 commits into from

Conversation

kvalev
Copy link
Owner

@kvalev kvalev commented Jul 13, 2023

No description provided.

seeschloss and others added 30 commits June 12, 2023 18:02
@seeschloss @lastzero
Backend: Add a 'search' CLI command
a891da7
@lastzero
CLI: Improve "find" command to support more output formats photoprism…
39e26b7 
…#3222

It is now also possible to limit the number of results (10k by default).

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
CLI: Shorten "find" command usage description photoprism#3222
092fe04 
Signed-off-by: Michael Mayer <[email protected]>
@dxc-maravillo @lastzero
Removed omit tag so that Photo's Album array gets populated
97ae47b
@dxc-maravillo @lastzero
Sample use of populated Albums array.
0b9cb2e
@lastzero
UX: Show albums in the Info tab of the edit dialog photoprism#3095
6a4bfa8 
Signed-off-by: Michael Mayer <[email protected]>
@fly-man- @lastzero
Update MomentLabels
4ecece5 
* Add large Holidays
* Add assortment of pets
@lastzero
Moments: Update holidays and pets photoprism#3081
edf53a9 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Backend: Update deps in go.mod and go.sum
00b1472 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Frontend: Update deps in package-lock.json
9a5af31 
Signed-off-by: Michael Mayer <[email protected]>
@alexislefebvre @lastzero
add link from file tab to folder
9e316a2
@lastzero
Photos: Refactor link from the Files tab to the file folder photopris…
53aeaff 
…m#2926

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
CLI: Change type of import --dest flag to string photoprism#3473
a7cc1e3 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Backend: Update deps in go.mod and go.sum
b91723e 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
CI: Update Makefile
4430c79 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Refactor directory initialization and improve inline docs
a7c8f01 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Photos: Display link to file browser depending on user permissions ph…
f933aaa 
…otoprism#2926

Also changes the button label from "Folder" to "File Browser".

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Frontend: Update source line numbers in translations.pot
4a66c75 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Frontend: Update deps in package-lock.json
1776728 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Photos: Skip related albums from which a photo was removed photoprism…
90a18f6 
…#3095

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
CI: Update release target in Makefile
f1e98f9 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Albums: Flag all unknown / deleted photos as missing to fix counts ph…
ae095f4 
…otoprism#3481

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Albums: Replace tabs with spaces in SQL query photoprism#3481
fa5d8b4 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Videos: Play videos in full size (work in progress)
df0d93b 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Revert "Videos: Play videos in full size (work in progress)"
054a076 
This reverts commit df0d93b.
@lastzero
CLI: Improve length check in "photoprism passwd" command photoprism#3482
87b6d72 


Signed-off-by: Michael Mayer <[email protected]>
@lastzero
UX: Improve video player size, background and error handling photopri…
31f9b88 
…sm#1307 photoprism#3372

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Frontend: Update deps in package-lock.json
ee6e6c6 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Backend: Update deps in go.mod and go.sum
96e0981 
Signed-off-by: Michael Mayer <[email protected]>
@weblate @lastzero
Weblate: Update frontend translations
0818d59
lastzero and others added 19 commits July 12, 2023 15:51
@lastzero
Backend: Update go.mod
91c006a
@lastzero
Develop: Update base image from 230628 tp 230712
dbc2887
@lastzero
Backend: Update deps in go.mod and go.sum
945737b
@lastzero
Config: Add PHOTOPRISM_DISABLE_TLS to docker-compose.yml examples pho…
14b415d 
…toprism#3509

This commit also adds example batch files for Windows users.

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update docker/windows/install.bat example photoprism#3509
b9a7cb4 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update docker/windows/install.bat example photoprism#3509
38e8e1b 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update windows batch file examples photoprism#3509
09bd901 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update windows install.bat example photoprism#3509
c172e06 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update windows install.bat example photoprism#3509
89842c8 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update windows uninstall.bat example photoprism#3509
131ccba 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update windows (un)install.bat examples photoprism#3509
bc05936 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Add "@echo off" to windows batch file examples photoprism#3509
5176380 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Increase wait time in install.bat file example photoprism#3509
00acfb5 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Improve windows batch script examples photoprism#3509
d574abf 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Download update.bat in windows batch script examples photopri…
7e680a6 
…sm#3509

Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update uninstall.bat Windows batch script photoprism#3509
f225191 
Signed-off-by: Michael Mayer <[email protected]>
@lastzero
Config: Update install.bat Windows batch script photoprism#3509
40a0185 
Signed-off-by: Michael Mayer <[email protected]>
@kvalev
Merge branch 'preview' into develop-upstream
89a839a
@kvalev
Backend: Update Go dependencies
d86cebf
@github-actions
Copy link

github-actions bot commented Jul 19, 2023 •
edited
Loading

Uffizzi Ephemeral Environment deployment-31336

☁️ https://app.uffizzi.com/github.com/kvalev/photoprism/pull/139

📄 View Application Logs etc.

⏰ This Preview will be destroyed in 48 hours at: Sat Jul 22 08:43:32 UTC 2023

What is Uffizzi? Learn more!

@kvalev kvalev temporarily deployed to uffizzi July 20, 2023 07:57 — with GitHub Actions Inactive
@kvalev
CI: Do not create https certificate for Uffizzi
0ad4940 
The creation of the self-signed certificate breaks the Uffizzi preview
environment.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.