1
Fork 0
Commit Graph

1241 Commits

Author SHA1 Message Date
viktorstrate 5c1f8b4632
clean up build action 2023-07-10 22:49:01 +02:00
viktorstrate b2a79a4c9d
update and simplify github build action 2023-07-10 18:57:50 +02:00
Viktor Strate Kløvedal 228f2cc1e7
Merge pull request #842 from secco04/patch-2
update german translation
2023-05-11 17:59:18 +02:00
4ich aed0a17166
update german translation
fixing my mistake on timeline year selector
missing label for share/password protection and expiration,
missing label for thumbnail settings ...
2023-05-06 17:35:48 +02:00
Viktor Strate Kløvedal 9364662db8
Merge pull request #841 from secco04/patch-1 2023-05-06 15:58:54 +02:00
4ich fe4e2ffc06
Updated Translation for German
i'm hoping i got all the fields filled, where the german translation was missing. 
i also found a spelling mistage  in the password reset dialogue and a "usernamevar" wich is not yet used.
2023-05-06 15:27:44 +02:00
Viktor Strate Kløvedal c38f8a43c3
Merge pull request #838 from djvaldez/fix-custom-basepath
Fix custom basepath in React components
2023-05-01 15:02:36 +02:00
David Valdez efda44a20b Fix case of double slash 2023-04-30 17:17:59 -05:00
David Valdez 18c9acfa81 Merge branch 'dev' of github.com:djvaldez/photoview into fix-custom-basepath 2023-04-29 20:38:28 -05:00
David Valdez 170f1ac59c Fix for login URL 2023-04-30 01:37:36 +00:00
David Valdez d8bb69bbba Remove hardcoded basepath 2023-04-29 20:36:07 -05:00
David Valdez 31f1810e5e Add support for custom base path to URL generator 2023-04-26 04:41:08 +00:00
David Valdez cb44e8572f Changes to support custom basepath in routing 2023-04-25 02:20:29 +00:00
Viktor Strate Kløvedal 30c1b2a152
Merge pull request #822 from john-dev/master
Prepend missing key CreationDate to createDateKeys
2023-03-21 15:17:27 +01:00
john dev a28e9ba8b7
Prepend missing key CreationDate to createDateKeys 2023-03-21 14:26:03 +01:00
Viktor Strate Kløvedal dd5aa85a41
Merge pull request #810 from tymmej/ffmpeg_divisible_by_2
Fix encoding video thumbnails
2023-03-03 14:36:37 +01:00
Viktor Strate Kløvedal 27d0db5518
Merge pull request #807 from tymmej/extend_buffer
Fixes issue #804
2023-03-03 14:36:06 +01:00
Jakub Tymejczyk 030c9262c6 Fix encoding video thumbnails 2023-03-03 08:51:44 +01:00
Jakub Tymejczyk a2170bc02b Fixes issue 804 2023-02-28 15:33:02 +01:00
Viktor Strate Kløvedal 87e80cf21f
Merge pull request #802 from john-dev/patch-1
Add support to parse DateTimes with UTC+Offset
2023-02-15 10:05:29 +01:00
john dev 15e3cc3b8c
Add support to parse DateTImes with UTC offset 2023-02-15 08:29:41 +01:00
Viktor Strate Kløvedal fdae46a548
Merge pull request #799 from WindLi001/clean
Use Clean() but not Abs() to prevent directory traversal
2023-02-13 17:31:49 +01:00
WindLi001 6bebed4693 use Clean() but not Abs() to prevent directory traversal 2023-02-10 21:05:17 +08:00
Viktor Strate Kløvedal dcc05f4ea8
Merge pull request #798 from WindLi001/limit-thumbnail-size
Limit thumbnail size of small original photo in new branch
2023-02-10 11:19:51 +01:00
WindLi001 0ac38e6605 Limit thumbnail size of small original photo 2023-02-10 12:53:25 +08:00
Viktor Strate Kløvedal 824a835a20
Merge pull request #796 from WindLi001/trans-cn 2023-02-09 09:12:23 +01:00
WindLi001 1795a27ae3 Fix translation error of Chinese UI. The "detach_image" should be "解除面孔标记", but not "修改面孔命名". 2023-02-09 15:15:51 +08:00
Viktor Strate Kløvedal 1795ff13be
Merge pull request #795 from Ajnasz/transaction-error
fix transaction already commited error
2023-02-08 13:34:41 +01:00
Lajos Koszti 1f8664d7f8
fix transaction already commited error
I encountered with the following error:

> 2023/02/05 07:33:00 /app/scanner/face_detection/face_detector.go:92 sql: transaction has already been committed or rolled back
> [0.042ms] [rows:0] SELECT * FROM `media` WHERE `media`.`id` = 823 ORDER BY `media`.`id` LIMIT 1
> 2023/02/05 07:33:00 ERROR: Error detecting faces in image (/photos/Borzsony2017/DSC_0028.NEF): sql: transaction has already been committed or rolled back

It turned out it comes from the api/routes/photos.go

I found a very similar code in album_scanner.go.
The difference I saw was that while in the single photo request the
transaction passed to the `scanner_tasks.Tasks.BeforeProcessMedia` call,
in the album_scann.go the transaction created after this call and
created from the context which returned by `BeforeProcessMedia`.

Another difference was that in the `ProcessSingleMedia` call the
`AfterProcessMedia` call was called with the same - db transaction -
context, in the album_scanner it was called outside of the transaction.

I changed the logic by merging the two behavior:
Create the transaction from the context of `BeforeProcessMedia` and also
use the transaction context in the `AfterProcessMedia`.
After the change the error disappeared.

So to have it in a common place I extracted that logic into a function
and use for both the single photo request and in the album scanner.

I did not go more deeper to find out what's going on with the context
under the hood.
2023-02-05 09:05:05 +01:00
Viktor Strate Kløvedal 92bcba0334
Merge pull request #780 from queeup/master 2022-12-03 02:42:54 +01:00
queeup a797170881 Add Turkish language 2022-12-02 15:32:49 +03:00
Viktor Strate Kløvedal 172bbebdd8
Merge pull request #774 from noel123007/chore/joe/add-globe-view
add globe view of mapbox in Places page
2022-11-27 21:32:10 +01:00
Joe 89a3830c17 chore: add mapbox globe view 2022-11-14 11:23:11 +05:30
Viktor Strate Kløvedal c786217711
Merge pull request #752 from orellazri/timeline_reformatting
Restyle titles and spacing in timeline gallery
2022-10-09 20:38:01 +02:00
Orel f54e6c7cb5 Restyle titles and spacing in timeline gallery
Restyle the title and album names so that the title will pop out more,
and decrease the horizontal spacing between photos in the same album.
2022-10-07 01:32:28 +03:00
Viktor Strate Kløvedal b0bdf5414c
Merge pull request #749 from rainpenber/config_improved_zh_CN_translation 2022-09-14 07:02:38 +02:00
ryanpenber efbc54017b config🔧: Improved Simplified Chinese language translation
Modified the translation to fit the simplified Chinese user's habit
while paying respect to the predecessor

Change Explained:
- type 种类 (catagory) → 文件类型 (file type) or 格式 (file format)
- all of 'faces' 脸孔 (Traditional Chinese) → 面孔 (Simplified Chinese)
- search placeholder 搜寻 (Traditional Chinese) → 查找 (Simplified Chinese)
-  Simple and User-friendly Photo Gallery for Personal Servers
old: 简单及易用的照片库给个人服务器 (grammar mistake)
→ 为个人服务器 打造的 简单及易用的照片库 (put the "for..." part upfront)
- detach image:
分离照片脸孔 is confusing, may indicate to remove literal face from photo
解除标记:remove tag (from the photo)
- (scanner) jobs: 工作 ( has the meaning of employment in most scenario)
→  任务 (tasks)
- all of the 'iser':使用者 (correct but low word frequency) → 用户
- action:动作 (means movement in most scenario) → 操作 (operation)
- capabilities: 能力(capable of) → 权限 (access to)
- release: 释出版本(Traditional Chinese) → 发行版 (Simplified Chinese)

- add translation to the face label
- add translation to the preference page
- add translation to sidebar
- add translation to media EXIF info
- add translation to timeline filter

translation media EXIF info reference:
https://bbs.zol.com.cn/dcbbs/d167_107631.html
2022-09-14 10:49:08 +08:00
PJ-Watson 1a05b353e6 Merge branch 'eadisor-add_swipe_gesture'
Small changes between the original branch by eadisor and the master branch prevented this from being a straightforward merge (photoGalleryReducer -> mediaGalleryReducer). Also bumped the version number of react-swipeable to avoid a breaking version change further down the line.
2022-08-12 07:06:13 +01:00
PJ-Watson 0d106274d2 Manual merge of changes from react-swipeable branch, update react-swipeable version 2022-08-12 07:00:05 +01:00
PJ-Watson 4169a2c102
Merge branch 'master' into add_swipe_gesture 2022-08-12 15:42:18 +10:00
PJ-Watson 5c1bbf9065
Fixed ScanAlbum failing silently.
2.3.12 -> 2.3.13 restructured ScanAlbum so that errors were returned rather than raising a ScannerError directly - this ensures that the errors are logged correctly.
2022-08-12 02:18:59 +01:00
PJ-Watson c8a9331f69
Merge pull request #728 from PJ-Watson/thumbnail_testing
Add support for .CR3 photos
2022-08-11 15:11:52 +10:00
PJ-Watson 7715865309 Add support for .CR3 photos. 2022-08-10 07:43:39 +01:00
Viktor Strate Kløvedal ced9e3209f
Merge pull request #725 from PJ-Watson/thumbnail_testing
Thumbnail Rendering Options
2022-08-09 10:15:08 +02:00
PJ-Watson ca889d02bd Fixed site_info_test - missing model import. 2022-08-09 06:43:25 +01:00
PJ-Watson 3e780dbe48 Changed downsampling method to custom type. 2022-08-09 06:09:55 +01:00
PJ-Watson 866a3b4c1d Fixed ui test (default export). 2022-08-05 20:56:38 +01:00
PJ-Watson 31025f7616 Updated ui layout. 2022-08-05 20:35:00 +01:00
PJ-Watson 1c784fa5e9 Simple api test 2022-08-05 19:40:26 +01:00
PJ-Watson ccf4e30639 Including ui test 2022-08-05 19:39:06 +01:00