Commit Graph

464 Commits

Author SHA1 Message Date
cff66e72d6 #94: Child albums now display as 6 and 6 columns on mobile (xs) devices. Pager links are also centered. 2018-08-07 09:07:54 +01:00
Andy Heathershaw
8df9fe7827 Merge branch 'feature/90-photo-date-uploaded' of aheathershaw/blue-twilight into master 2018-08-06 17:08:25 +01:00
bdfb3067dc #90: Added language string (mistakenly committed to user profile branch) 2018-08-06 17:06:59 +01:00
Andy Heathershaw
07f34aa158 Merge branch 'feature/89-more-date-formats' of aheathershaw/blue-twilight into master 2018-08-06 17:04:45 +01:00
372cc0839f #90: Date created is now displayed on the individual photo page 2018-08-06 17:02:51 +01:00
4575bac725 #89: Added additional date formats 2018-08-06 17:00:43 +01:00
4f91863f75 #19: The user profile now displays activity based on taken and uploaded dates 2018-08-06 16:59:50 +01:00
Andy Heathershaw
7e25e65336 #19: The user profile grid is now much more Github-like 2018-08-06 14:02:45 +01:00
Andy Heathershaw
843f284570 Merge branch 'master' into feature/19-user-profile-screen 2018-08-03 12:28:32 +01:00
Andy Heathershaw
1553bd8620 Update 'readme.md' 2018-07-31 22:16:53 +01:00
Andy Heathershaw
031accdf78 Update 'contributing.md' 2018-07-31 21:29:22 +01:00
Andy Heathershaw
30dd0c807d Update 'contributing.md' 2018-07-31 21:26:43 +01:00
Andy Heathershaw
bc764d4ee1 Merge branch '86-contribution-readme-links' of Pandy06269/blue-twilight into master 2018-07-31 18:17:34 +01:00
3904d29c5c #86: Updated contributing file with the new web page and updated links in the readme to Gitea instead of Github, and the rebrand of andysh.uk 2018-07-31 08:46:03 +01:00
0836ca5557 #86: Switched the update check from Github to Gitea 2018-07-29 22:07:55 +01:00
4456cd5fa7 #86: Switched the update check from Github to Gitea 2018-07-29 21:58:28 +01:00
1220e87bc9 Merge branch 'v2.1'
# Conflicts:
#	config/app.php
2018-07-28 09:01:32 +01:00
c029c6ca00 Bumped version for the 2.1.2 release 2018-07-28 09:00:57 +01:00
aa2998ac70 #85: Changed the way next/previous buttons work, and introduced a more consistent ordering when large numbers of photos were uploaded at the same time 2018-07-28 09:00:23 +01:00
eedfd5abdd #84: Corrected permissions query for a non-admin user returning incorrect child albums 2018-07-28 09:00:18 +01:00
efd57cde08 #85: Changed the way next/previous buttons work, and introduced a more consistent ordering when large numbers of photos were uploaded at the same time 2018-07-28 08:59:51 +01:00
566db25316 #84: Corrected permissions query for a non-admin user returning incorrect child albums 2018-07-28 08:59:07 +01:00
33680faf92 #19: First draft of the new user profile page, incorporating the beginnings of a heat-map of activity 2018-07-16 06:04:44 +01:00
cd2dcc22a2 #80: Updated Laravel to 5.5 LTS 2018-07-16 03:51:59 +01:00
9a65e8f1c9 Bumped version number for 2.1.1 2018-07-16 03:31:35 +01:00
9ea1953ada #79: Corrected validation errors on the login screen 2018-07-15 21:57:15 +01:00
8dd31961e7 #79: Updated the checkbox on the statistics page for Bootstrap 4 final 2018-07-15 21:45:39 +01:00
c784c623ba Include all update steps in update.php 2018-07-15 21:34:15 +01:00
9064495f1f Updated the Github URL to andysh-uk. Update script now downloads Composer, like the install script does. 2018-07-15 21:32:17 +01:00
e2d66fd228 Merge branch 'master' into v2.1 2018-07-14 08:22:38 +01:00
9740582b6e #73: Updated the message when a metadata-update fails so it doesn't say it's removing the photo 2018-07-14 08:15:19 +01:00
d63423bc47 Bumped version number ready for the beta release 2018-07-13 08:12:38 +01:00
2571675b24
Bumped version number ready for the beta release 2018-07-13 07:51:10 +01:00
6040c7d4ef #65: Don't start uploading if no file was selected 2018-07-13 00:00:45 +01:00
4b7b99431f #79: Upgraded Bootstrap to 4.1.2. Number of HTML mark-up changes following the BS upgrade. 2018-07-12 23:46:59 +01:00
ab690b1e25 #68: Reworked the upload progress modal to use modal-footer correctly 2018-07-12 23:18:40 +01:00
393cc590c1 #68: Added a "Close" button when an single file into an upload fails 2018-07-12 23:08:39 +01:00
ef4df1ab32 #59: Added 2 new settings to customise the albums drop-down navigator. It is now possible to choose to only display top-level albums, and also to restrict the number of items. 2018-07-12 22:52:50 +01:00
f96a9cd9f7 #58: It is now possible to create albums named the same within different parent albums. Albums with child albums can now not be deleted, as this could leave duplicate albums in the same parent album. 2018-07-12 21:55:01 +01:00
790d354167 #72: When counting albums in the admin stats widget, count all, not just the current page 2018-07-12 06:42:57 +01:00
036814705f #74: Suppress warning on mkdir due to a race condition for multiple uploads 2018-07-12 06:38:56 +01:00
534c8f6090 #75: Reworked the way metadata is calculated so empty albums are not displayed as upgradable. Also improved the "no albums" message, as it's no longer accurate. 2018-07-12 06:35:08 +01:00
309d97cb75 #77: Minor improvements to meta-data update page 2018-07-12 06:09:28 +01:00
06869a157c #68: Updated footer links to andysh.uk 2018-07-12 06:05:29 +01:00
f007371a79 Merge remote-tracking branch 'origin/master' 2018-07-12 05:59:29 +01:00
cb6ae98907 #62: Found another reference to the global $albums variable, now $g_albums 2018-07-12 05:58:40 +01:00
Andy Heathershaw
189aafe61c
#62: another $albums reference 2018-07-11 08:49:43 +01:00
Andy Heathershaw
efdcecfca6
#62: Further correction to $albums variable 2018-07-11 08:45:40 +01:00
cc3370c4b1 #62: Don't clobber the $albums variables in the navbar, so it now shows all albums not just the single page you're currently viewing 2018-07-11 08:00:40 +01:00
04d1e59778 #61: Album breadcrumbs in admin panel now include full path of parent albums 2018-07-11 07:52:59 +01:00