Theresa Gresch f063b0ba1b Merge branch 'develop' ... # Conflicts: # frontend/src/dialog/p-upload-dialog.vue # frontend/src/dialog/photo/edit.vue # frontend/src/dialog/photo/info.vue # frontend/src/resources/de.mo # frontend/src/resources/de.po # frontend/src/resources/translations.json # frontend/src/resources/translations.pot		2020-06-16 10:51:31 +02:00
..
common	Frontend: Upgrade dependencies	2020-06-09 10:52:42 +02:00
component	Frontend: Add translate tags	2020-06-16 10:08:34 +02:00
css	Add simple file browser to Library #260	2020-05-24 22:16:06 +02:00
dialog	Frontend: Fix and update translation	2020-06-16 10:39:00 +02:00
maps/marker	Initial code for new Places UI	2020-01-15 04:04:33 +01:00
model	Frontend: Add fields to advanced tab (edit dialog)	2020-06-10 18:26:05 +02:00
pages	Frontend: Fix and update translation	2020-06-16 10:39:00 +02:00
resources	Frontend: Fix and update translation	2020-06-16 10:39:00 +02:00
app.js	Frontend: Improve navigation and fix unit tests	2020-05-31 12:52:41 +02:00
photoprism.vue	Add play button for videos to photo viewer #321	2020-05-20 10:42:48 +02:00
routes.js	Frontend: Change states route	2020-06-09 08:13:51 +02:00
session.js	Initial commit for folders and moments #154 #260 #331	2020-05-23 20:58:58 +02:00