Dan Brown
5f2d226f09
Merge branch 'master' into 2019-design
2019-03-10 21:40:02 +00:00
Dan Brown
44c537de1a
Performed some LDAP service/test cleanup
2019-03-10 10:54:19 +00:00
Dan Brown
6bccf0e64a
Merge branch 'feature-ldap-attributes' of git://github.com/dfanara/BookStack into dfanara-feature-ldap-attributes
2019-03-10 10:31:09 +00:00
Dan Brown
042a6f9760
Updated shelf menu item to show on custom permission
...
- Extended new 'userCanOnAny' helper to take a entity class for
filtering.
Closes #1201
2019-03-09 21:15:45 +00:00
Dan Brown
5c9b528517
Abstracted userCanCreatePage helper to work for any permisison
...
- Added test to cover scenario where someone with create-own permission
would want to copy a viewable item into a container entity that they
own.
2019-03-09 16:50:22 +00:00
Dan Brown
6be2d3f28c
Merge branch 'Copy-For-View-Only' of git://github.com/mark-james/BookStack into mark-james-Copy-For-View-Only
2019-03-09 16:12:12 +00:00
Daniel Fanara
502ea608bf
Issue #1306 - Unit Tests for LdapService Changes
2019-03-09 01:08:49 -05:00
Daniel Fanara
55b07c7076
Issue #1306 - Specify display name attribute from LDAP
2019-03-08 23:55:11 -05:00
Dan Brown
3286f29a61
Merge branch 'master' into 2019-design
2019-02-09 14:58:38 +00:00
Dan Brown
5325870271
Updated auth pages to new design, Removed public layout
2019-02-03 17:34:15 +00:00
Dan Brown
138f5d5c4f
Updated user and shelf views to new design
2019-02-03 13:45:45 +00:00
abijeet
5ef0992d5b
PHPCS related fixes.
2019-01-27 15:59:23 +05:30
Mark James
19770d2792
Use joint_permissions to determine is a user has an available page or chapter to copy.
2019-01-02 16:55:28 +11:00
Dan Brown
2317bf2350
Added check for last admin on role change
...
Will show error message if last admin and admin role is removed.
Closes #1124
Also cleaned up user controller a little.
2018-12-30 16:11:58 +00:00
Dan Brown
b56fc21aaf
Abstracted user avatar fetching away from gravatar
...
Still uses gravatar as a default.
Updated URL placeholders to follow LDAP format.
Potential breaking config change: `GRAVATAR=false` replaced by `AVATAR_URL=false`
Builds upon #1111
2018-12-22 19:29:19 +00:00
Dan Brown
d673bf61c2
Merge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into Vinrobot-custom-avatar-provider
2018-12-22 18:18:14 +00:00
Dan Brown
7c8edf5673
Merge pull request #1096 from christophert/add-ldaptlsinsecure
...
Add option to disable LDAPS Certificate Validation
2018-12-22 16:38:50 +00:00
Dan Brown
26ec1cc3dc
Added proper escaping to LDAP filter operations
...
To cover #1163
2018-12-20 20:04:09 +00:00
Vinrobot
5e6c039b08
Added config to change Gravatar URL
2018-11-10 16:11:11 +01:00
Dan Brown
178b5af83a
Added google select_account test
...
Also cleaned the function naming a little to be more descriptive of the
work they do.
2018-11-10 14:52:43 +00:00
Justin Stein
2ca8038df2
Removed return from documentation for function redirectToSocialProvider
2018-11-04 11:07:04 -08:00
Justin Stein
89de328439
Merge branch 'master' of https://github.com/BookStackApp/BookStack
2018-11-04 11:04:30 -08:00
Justin Stein
c37e73b626
Moved redirect functionality back to start register and log in functions
2018-11-04 10:48:55 -08:00
Justin Stein
0283ab11b5
Added function for redirect with parameters for Socialite
2018-11-04 10:40:06 -08:00
Christopher Tran
8e7f703af7
fix how the option is set, change handle to NULL
2018-10-27 16:58:10 -04:00
Christopher Tran
6c14c09880
Add ability to disable LDAP certificate validation
2018-10-27 16:14:19 -04:00
Justin Stein
216358c6e4
Added Google select account functionality to login
2018-10-13 15:14:06 -07:00
Justin Stein
57d99130ee
Added environment variable for google select account option.
2018-10-13 14:50:58 -07:00
Justin Stein
79afec9737
Revert "Added else clause"
...
This reverts commit 77d7f764f1
2018-10-13 14:31:29 -07:00
Dan Brown
85f330c79a
Extracted many page-specific repo methods into page-specific repo
2018-10-13 11:27:55 +01:00
justein230
77d7f764f1
Added else clause
2018-10-12 22:50:02 -07:00
Justin Stein
a76599bd2a
Add select account parameter for google authorization
...
Useful for choosing an account if a default account is outside the scope of a G Suite organization.
2018-10-12 11:52:13 -07:00
Dan Brown
495d18814a
Updated various classes to take EntityProvider instead of separate entities
2018-09-25 18:00:40 +01:00
Dan Brown
257a5a23ec
Fleshed out entity provided and optimized imports
2018-09-25 16:58:03 +01:00
Dan Brown
919660678b
Re-structured the app code to be feature based rather than code type based
2018-09-25 12:30:50 +01:00
