Commit Graph

334 Commits

Author SHA1 Message Date
eddb72c265 Merge branch 'master' into feature/99-user-settings-page 2018-08-27 21:29:10 +01:00
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
98ddb06b76 #5: Implemented login with Google account 2018-08-17 13:37:58 +01:00
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
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
5926bbcb33 Merge branch 'master' into feature/5-social-media-sso 2018-08-16 08:48:12 +01:00
29f43db7ea Merge branch 'v2.1' 2018-08-16 08:47:37 +01:00
fa861c0b09 #86: Updated more references from Github to Gitea (Admin > About page) 2018-08-16 08:46:19 +01:00
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
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
8af88c56aa #5: Added settings UI to configure Facebook login 2018-08-14 09:12:28 +01:00
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
564fcd4b09 #5: Added Laravel Socialite. The redirect to Facebook is now working. 2018-08-13 14:25:56 +01:00
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
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
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
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
6e4eaf35dd #93: Updated mark-up of "add album redirect" checkbox to BS4 2018-08-07 09:15:06 +01:00
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