Commit Graph

443 Commits

Author SHA1 Message Date
Andy Heathershaw cb3791b4da Merge branch 'master' into feature/71-permissions-cache 2018-09-14 11:02:43 +01:00
Andy Heathershaw 3f55d4e0f0 #71: Started adding support for a DB-based permissions cache and ability to rebuild it 2018-09-14 11:02:08 +01:00
Andy Heathershaw 4b8cd6e5ab Merge branch 'feature/99-user-settings-page' of aheathershaw/blue-twilight into master 2018-09-12 21:25:02 +01:00
Andy Heathershaw c369ea5703 Added validation to the user’s profile alias field 2018-09-12 21:24:15 +01:00
Andy Heathershaw 2e0e98810a #99: Email address can now be changed and confirmed with registration 2018-09-12 17:08:27 +01:00
Andy Heathershaw 5a04247621 #99: Started working on e-mail address activation when changed using the user settings page 2018-09-12 14:27:34 +01:00
Andy Heathershaw 929237ef90 #99: User settings are now saving. Still need to implement validation on the profile name and e-mail verification for the new e-mail address. 2018-09-07 10:05:38 +01:00
Andy Heathershaw e4863af668 #5: Don't show the "alternatively..." message when no social media providers are configured 2018-09-07 09:03:21 +01:00
Andy Heathershaw 37375eb7e6 #99: Added user settings related to the new profile pages feature 2018-08-27 21:35:48 +01:00
Andy Heathershaw eddb72c265 Merge branch 'master' into feature/99-user-settings-page 2018-08-27 21:29:10 +01:00
Andy Heathershaw 4a54544756 #99: Added a basic user profile settings screen 2018-08-27 21:28:44 +01:00
Andy Heathershaw 56f555cda6 Merge branch 'feature/5-social-media-sso' of aheathershaw/blue-twilight into master 2018-08-18 08:57:23 +01:00
Andy Heathershaw 98ddb06b76 #5: Implemented login with Google account 2018-08-17 13:37:58 +01:00
Andy Heathershaw c56fe271ef #5: Twitter login is now working completely. If the Twitter app is not authorised to access the user's e-mail address, they still have to create a new account. 2018-08-16 14:01:56 +01:00
Andy Heathershaw 1ed4f297d2 #5: Added settings for configuring Twitter login, this is getting as far now as presenting the Twitter login screen. Login/register screens now respect the social media provider settings 2018-08-16 09:18:54 +01:00
Andy Heathershaw 5926bbcb33 Merge branch 'master' into feature/5-social-media-sso 2018-08-16 08:48:12 +01:00
Andy Heathershaw 29f43db7ea Merge branch 'v2.1' 2018-08-16 08:47:37 +01:00
Andy Heathershaw fa861c0b09 #86: Updated more references from Github to Gitea (Admin > About page) 2018-08-16 08:46:19 +01:00
Andy Heathershaw 8290bafb04 #5: It's now possible to sign in/register with a Facebook account, and to link the FB account to an existing account by entering the account's password. 2018-08-15 14:22:13 +01:00
Andy Heathershaw 40fc25eba9 #5: Facebook login is now working using the app ID/secret stored in the database, instead of in the services file 2018-08-14 12:57:41 +01:00
Andy Heathershaw 8af88c56aa #5: Added settings UI to configure Facebook login 2018-08-14 09:12:28 +01:00
Andy Heathershaw 52473f846e #5: Facebook social login now works. Added Facebook to the login screen template (I'm not 100% happy with this, may need a bit more work.) 2018-08-13 22:03:12 +01:00
Andy Heathershaw 564fcd4b09 #5: Added Laravel Socialite. The redirect to Facebook is now working. 2018-08-13 14:25:56 +01:00
Andy Heathershaw eaba161f5c #19: Added a link to user's public profile page, if enabled. Removed a stray semi-colon in album views. Updated user's profile page to use the new partial view for child albums. 2018-08-11 09:30:48 +01:00
Andy Heathershaw a22ce0c57a #19: Added a check for the user.enable_profile_page column when viewing the profile page. Added link to user's profile page (if enabled) in album footers. Tooltips are now enabled globally. Child album's footer now shows the details as tooltips. 2018-08-11 09:20:40 +01:00
Andy Heathershaw 7e721966e9 #19: The activity grids are now responsive. Improved the responsiveness of the user's image/nickname. 2018-08-08 09:31:56 +01:00
Andy Heathershaw 95a1298233 Merge branch 'master' into feature/19-user-profile-screen 2018-08-07 09:19:44 +01:00
Andy Heathershaw f3e52ac5b5 Merge branch 'bugfix/93-album-redirect-checkbox' of aheathershaw/blue-twilight into master 2018-08-07 09:16:30 +01:00
Andy Heathershaw 6e4eaf35dd #93: Updated mark-up of "add album redirect" checkbox to BS4 2018-08-07 09:15:06 +01:00
Andy Heathershaw 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
Andy Heathershaw 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
Andy Heathershaw 372cc0839f #90: Date created is now displayed on the individual photo page 2018-08-06 17:02:51 +01:00
Andy Heathershaw 4575bac725 #89: Added additional date formats 2018-08-06 17:00:43 +01:00
Andy Heathershaw 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
Andy Heathershaw 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
Andy Heathershaw 0836ca5557 #86: Switched the update check from Github to Gitea 2018-07-29 22:07:55 +01:00
Andy Heathershaw 4456cd5fa7 #86: Switched the update check from Github to Gitea 2018-07-29 21:58:28 +01:00
Andy Heathershaw 1220e87bc9 Merge branch 'v2.1'
# Conflicts:
#	config/app.php
2018-07-28 09:01:32 +01:00
Andy Heathershaw c029c6ca00 Bumped version for the 2.1.2 release 2018-07-28 09:00:57 +01:00
Andy Heathershaw 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
Andy Heathershaw eedfd5abdd #84: Corrected permissions query for a non-admin user returning incorrect child albums 2018-07-28 09:00:18 +01:00
Andy Heathershaw 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