73844b9eeb 
								
							 
						 
						
							
							
								
								Enabled type search filter in book search  
							
							
							
						 
						
							2017-04-15 19:31:11 +01:00  
				
					
						
							
							
								 
						
							
								dcde599709 
								
							 
						 
						
							
							
								
								Added chapter search  
							
							... 
							
							
							
							Migrated book search to vue-based system.
Updated old tag seached.
Made chapter page layout widths same as book page.
Closes  #344  
							
						 
						
							2017-04-15 19:16:07 +01:00  
				
					
						
							
							
								 
						
							
								0e0945ef84 
								
							 
						 
						
							
							
								
								Finished off UI for search system  
							
							
							
						 
						
							2017-04-15 15:04:30 +01:00  
				
					
						
							
							
								 
						
							
								dfaf20dd83 
								
							 
						 
						
							
							
								
								Actually include the Queueable namespace...  
							
							
							
						 
						
							2017-04-13 20:09:38 -04:00  
				
					
						
							
							
								 
						
							
								786262db3b 
								
							 
						 
						
							
							
								
								Queue confirmation emails.  
							
							... 
							
							
							
							Implements Laravel's queue abilities into the email notification job. Should not affect existing installations that are not using queues as the environment file defaults to `sync`. 
							
						 
						
							2017-04-13 20:03:03 -04:00  
				
					
						
							
							
								 
						
							
								46f3d78c8a 
								
							 
						 
						
							
							
								
								Fixed entity type filter bug in new search system  
							
							
							
						 
						
							2017-04-09 21:12:13 +01:00  
				
					
						
							
							
								 
						
							
								1338ae2fc3 
								
							 
						 
						
							
							
								
								Started search interface, Added in vue and moved fonts  
							
							
							
						 
						
							2017-04-09 20:59:57 +01:00  
				
					
						
							
							
								 
						
							
								37813a223a 
								
							 
						 
						
							
							
								
								Improved DB prefix support and removed old search method  
							
							
							
						 
						
							2017-04-09 14:44:56 +01:00  
				
					
						
							
							
								 
						
							
								01cb22af37 
								
							 
						 
						
							
							
								
								Added tag searches and advanced filters to new search  
							
							
							
						 
						
							2017-03-27 18:05:34 +01:00  
				
					
						
							
							
								 
						
							
								331305333d 
								
							 
						 
						
							
							
								
								Added search term parsing and exact term matches  
							
							
							
						 
						
							2017-03-27 11:57:33 +01:00  
				
					
						
							
							
								 
						
							
								0651eae7ec 
								
							 
						 
						
							
							
								
								Improve efficiency of single entity search indexing  
							
							
							
						 
						
							2017-03-26 19:34:53 +01:00  
				
					
						
							
							
								 
						
							
								1552417598 
								
							 
						 
						
							
							
								
								Developed basic search queries.  
							
							... 
							
							
							
							Updated search & permission regen commands with ability to specify
database. 
							
						 
						
							2017-03-26 19:24:57 +01:00  
				
					
						
							
							
								 
						
							
								cc0ce7c630 
								
							 
						 
						
							
							
								
								Fixed bug preventing page revision restore  
							
							... 
							
							
							
							Added regression tests to cover.
Fixes  #341  
							
						 
						
							2017-03-23 22:19:14 +00:00  
				
					
						
							
							
								 
						
							
								070d4aeb6c 
								
							 
						 
						
							
							
								
								Started implementation of new search system  
							
							
							
						 
						
							2017-03-19 12:48:44 +00:00  
				
					
						
							
							
								 
						
							
								36173eb47d 
								
							 
						 
						
							
							
								
								Removed extension from translation script link  
							
							... 
							
							
							
							Also fixed bug causing EN translation backup to not be passed
to javascript translation system.
Closes  #328  
							
						 
						
							2017-03-05 14:10:55 +00:00  
				
					
						
							
							
								 
						
							
								a90f564980 
								
							 
						 
						
							
							
								
								Made LDAP email attribute configurable via .env  
							
							... 
							
							
							
							Closes  #306  
						
							2017-02-26 14:51:49 +00:00  
				
					
						
							
							
								 
						
							
								253132afdf 
								
							 
						 
						
							
							
								
								Added chapter export options  
							
							... 
							
							
							
							Closes  #177  
						
							2017-02-26 14:25:02 +00:00  
				
					
						
							
							
								 
						
							
								eded8abded 
								
							 
						 
						
							
							
								
								Added book export and created export tests to cover  
							
							... 
							
							
							
							In reference to #177  
							
						 
						
							2017-02-26 13:26:51 +00:00  
				
					
						
							
							
								 
						
							
								0abed1afe5 
								
							 
						 
						
							
							
								
								Added clear activity/revision commands. Cleaned commands.  
							
							... 
							
							
							
							Added testing to cover each command.
Removed example laravel inspire command.
Standardised command names to be behind 'bookstack' naming.
In reference to #320 . 
							
						 
						
							2017-02-26 09:16:24 +00:00  
				
					
						
							
							
								 
						
							
								22077d4181 
								
							 
						 
						
							
							
								
								Updated DOMPDF to latest version  
							
							
							
						 
						
							2017-02-25 14:59:56 +00:00  
				
					
						
							
							
								 
						
							
								387047f262 
								
							 
						 
						
							
							
								
								Fixed inaccessible revisions, added regression tests  
							
							... 
							
							
							
							Fixes  #309  
						
							2017-02-25 12:29:01 +00:00  
				
					
						
							
							
								 
						
							
								a6128a1df1 
								
							 
						 
						
							
							
								
								Merge bugfixes from  branch 'v0.14'  
							
							
							
						 
						
							2017-02-05 21:24:15 +00:00  
				
					
						
							
							
								 
						
							
								6638ee47d3 
								
							 
						 
						
							
							
								
								Fixed entities wrongly visible on 404  
							
							... 
							
							
							
							Also ensured header state as expected on 404.
In reference to BookStackApp/website#9  
							
						 
						
							2017-02-05 21:19:29 +00:00  
				
					
						
							
							
								 
						
							
								65899a3e91 
								
							 
						 
						
							
							
								
								Prevented settings being overfetched from db/cache  
							
							
							
						 
						
							2017-02-05 18:57:57 +00:00  
				
					
						
							
							
								 
						
							
								86625a7642 
								
							 
						 
						
							
							
								
								Neatened up social login/register buttons  
							
							
							
						 
						
							2017-02-05 15:28:53 +00:00  
				
					
						
							
							
								 
						
							
								410e967eb1 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							
							
						 
						
							2017-02-05 16:46:32 +05:30  
				
					
						
							
							
								 
						
							
								076693efc9 
								
							 
						 
						
							
							
								
								Added facebook, slack & twitter sign in options.  
							
							... 
							
							
							
							Also added icon svg blade helper.
Closes  #125 . Starts #213 .
Requires documentation. 
							
						 
						
							2017-02-04 11:01:49 +00:00  
				
					
						
							
							
								 
						
							
								2431ce9f86 
								
							 
						 
						
							
							
								
								Merge branch 'v0.14'  
							
							
							
						 
						
							2017-02-01 22:28:38 +00:00  
				
					
						
							
							
								 
						
							
								9eecaea31a 
								
							 
						 
						
							
							
								
								Attempt to fix bookchildren and user getThumb  
							
							... 
							
							
							
							Hopefully Fixes  #292  and #294  and #287  
							
						 
						
							2017-02-01 22:16:32 +00:00  
				
					
						
							
							
								 
						
							
								148350009c 
								
							 
						 
						
							
							
								
								#47  Adds comment permission to each role.  
							
							
							
						 
						
							2017-01-29 14:25:20 +05:30  
				
					
						
							
							
								 
						
							
								70991fc1e5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Abijeet/BookStack  
							
							
							
						 
						
							2017-01-29 09:35:46 +05:30  
				
					
						
							
							
								 
						
							
								6669998c10 
								
							 
						 
						
							
							
								
								Upgraded to Laravel 5.4  
							
							
							
						 
						
							2017-01-25 19:35:40 +00:00  
				
					
						
							
							
								 
						
							
								492e2f173e 
								
							 
						 
						
							
							
								
								Fixed error causing permissions to be deleted on book sort  
							
							... 
							
							
							
							Closes  #282  
						
							2017-01-23 22:27:11 +00:00  
				
					
						
							
							
								 
						
							
								380f0f2042 
								
							 
						 
						
							
							
								
								Prevented a missing avatar from crashing the application  
							
							
							
						 
						
							2017-01-22 12:19:50 +00:00  
				
					
						
							
							
								 
						
							
								33d4844f17 
								
							 
						 
						
							
							
								
								Fixed role 'manage own permissions' permission  
							
							
							
						 
						
							2017-01-22 12:16:02 +00:00  
				
					
						
							
							
								 
						
							
								989de47f22 
								
							 
						 
						
							
							
								
								Fixed hidden book children for admins on upgrade  
							
							
							
						 
						
							2017-01-22 12:02:30 +00:00  
				
					
						
							
							
								 
						
							
								2d4034f3b7 
								
							 
						 
						
							
							
								
								Added transclusion tests and fixed other tests  
							
							
							
						 
						
							2017-01-21 16:16:27 +00:00  
				
					
						
							
							
								 
						
							
								a4f6bc63f0 
								
							 
						 
						
							
							
								
								Updated page include logic to use blade-style tags  
							
							... 
							
							
							
							It will also snippets of a page if and id is provided in a tag 
							
						 
						
							2017-01-21 13:53:00 +00:00  
				
					
						
							
							
								 
						
							
								e4e3b25c22 
								
							 
						 
						
							
							
								
								Started page transclusion system  
							
							
							
						 
						
							2017-01-16 21:24:48 +00:00  
				
					
						
							
							
								 
						
							
								dabf149411 
								
							 
						 
						
							
							
								
								Added user setting system and added user-lang option  
							
							... 
							
							
							
							Supports #115  
							
						 
						
							2017-01-15 16:27:24 +00:00  
				
					
						
							
							
								 
						
							
								ee5ded6e1e 
								
							 
						 
						
							
							
								
								Updated permission bookChildrenQuery to use QueryBuilder  
							
							
							
						 
						
							2017-01-15 15:00:29 +00:00  
				
					
						
							
							
								 
						
							
								598b07b53d 
								
							 
						 
						
							
							
								
								Updated LDAP to allow protocol to be specified  
							
							... 
							
							
							
							As per details by fredericmohr in #236  
							
						 
						
							2017-01-14 17:55:09 +00:00  
				
					
						
							
							
								 
						
							
								e211f31370 
								
							 
						 
						
							
							
								
								Merge branch 'patch-2' of git://github.com/fredericmohr/BookStack into fredericmohr-patch-2  
							
							
							
						 
						
							2017-01-14 17:30:49 +00:00  
				
					
						
							
							
								 
						
							
								969ad8911c 
								
							 
						 
						
							
							
								
								Updated page nav to hide when empty  
							
							
							
						 
						
							2017-01-14 15:34:52 +00:00  
				
					
						
							
							
								 
						
							
								397db04428 
								
							 
						 
						
							
							
								
								Added comments controller, model, repo, and the database schema. Modified existing Page model to associate with comments.  
							
							
							
						 
						
							2017-01-13 21:45:48 +05:30  
				
					
						
							
							
								 
						
							
								581c382f65 
								
							 
						 
						
							
							
								
								Fixed image delete permission issue  
							
							... 
							
							
							
							Also fixed missing translations and wrote tests to cover issue.
Fixes  #258  
							
						 
						
							2017-01-08 19:19:30 +00:00  
				
					
						
							
							
								 
						
							
								212cd710aa 
								
							 
						 
						
							
							
								
								Fixed default empty app settings effecting blank app color  
							
							... 
							
							
							
							Fixes  #265  
						
							2017-01-08 18:42:46 +00:00  
				
					
						
							
							
								 
						
							
								f2917fc462 
								
							 
						 
						
							
							
								
								Added tests to cover social login actions  
							
							... 
							
							
							
							Closes  #244  
						
							2017-01-02 14:56:58 +00:00  
				
					
						
							
							
								 
						
							
								7c8c4c2a05 
								
							 
						 
						
							
							
								
								Normalised page nav header inset when only small headers are used  
							
							
							
						 
						
							2017-01-02 12:13:03 +00:00  
				
					
						
							
							
								 
						
							
								8453191dfb 
								
							 
						 
						
							
							
								
								Finished refactor of entity repos  
							
							... 
							
							
							
							Removed entity-specific repos and standardised
the majority of repo calls to be applicable to
all entity types 
							
						 
						
							2017-01-02 11:07:27 +00:00  
				
					
						
							
							
								 
						
							
								65796cfc7b 
								
							 
						 
						
							
							
								
								Rewrote book children query  
							
							
							
						 
						
							2017-01-01 21:21:11 +00:00  
				
					
						
							
							
								 
						
							
								bab27462ab 
								
							 
						 
						
							
							
								
								Fixed issue where default user was over-fetched  
							
							
							
						 
						
							2017-01-01 17:33:06 +00:00  
				
					
						
							
							
								 
						
							
								241278226f 
								
							 
						 
						
							
							
								
								Refactored search and slug repo components  
							
							
							
						 
						
							2017-01-01 16:57:47 +00:00  
				
					
						
							
							
								 
						
							
								7f9de2c8ab 
								
							 
						 
						
							
							
								
								Started refactor to merge entity repos  
							
							
							
						 
						
							2017-01-01 16:05:44 +00:00  
				
					
						
							
							
								 
						
							
								3f0ef57d31 
								
							 
						 
						
							
							
								
								Added wkhtmltopdf support and done some style tweaks  
							
							... 
							
							
							
							Closes  #248  
						
							2017-01-01 12:20:30 +00:00  
				
					
						
							
							
								 
						
							
								0eb90cb3b6 
								
							 
						 
						
							
							
								
								Fixed carbon locale setting  
							
							
							
						 
						
							2016-12-31 14:38:04 +00:00  
				
					
						
							
							
								 
						
							
								9fe158b78a 
								
							 
						 
						
							
							
								
								Merge pull request  #255  from olexus/master  
							
							... 
							
							
							
							Add Carbon localization support 
							
						 
						
							2016-12-31 14:36:01 +00:00  
				
					
						
							
							
								 
						
							
								a24f3d7d47 
								
							 
						 
						
							
							
								
								Merge branch 'master' into translations  
							
							
							
						 
						
							2016-12-31 14:32:52 +00:00  
				
					
						
							
							
								 
						
							
								c9700e38e2 
								
							 
						 
						
							
							
								
								Created solution for JS translations  
							
							... 
							
							
							
							Also tidied up existing components and JS 
							
						 
						
							2016-12-31 14:27:40 +00:00  
				
					
						
							
							
								 
						
							
								05316c90ba 
								
							 
						 
						
							
							
								
								converted image picker to blade-based component  
							
							... 
							
							
							
							Also updated some other JS translations 
							
						 
						
							2016-12-24 15:21:19 +00:00  
				
					
						
							
							
								 
						
							
								f30f4579e9 
								
							 
						 
						
							
							
								
								Add Carbon localization support  
							
							
							
						 
						
							2016-12-19 11:05:06 +03:00  
				
					
						
							
							
								 
						
							
								573357a08c 
								
							 
						 
						
							
							
								
								Extracted text from logic files  
							
							
							
						 
						
							2016-12-04 16:51:39 +00:00  
				
					
						
							
							
								 
						
							
								c403d05755 
								
							 
						 
						
							
							
								
								Fixed social login routes  
							
							... 
							
							
							
							Fixes  #239  
						
							2016-11-27 19:11:15 +00:00  
				
					
						
							
							
								 
						
							
								340d3f833b 
								
							 
						 
						
							
							
								
								Update Ldap.php  
							
							... 
							
							
							
							This is a very crude workaround, a better solution is explained in the comments I added. 
							
						 
						
							2016-11-15 11:10:12 +01:00  
				
					
						
							
							
								 
						
							
								694a9459c1 
								
							 
						 
						
							
							
								
								Moved text from auth views into lang files  
							
							
							
						 
						
							2016-11-13 16:34:28 +00:00  
				
					
						
							
							
								 
						
							
								0fb1fc87c8 
								
							 
						 
						
							
							
								
								Enabled utf8 slugs  
							
							... 
							
							
							
							Prevents slug change when using only non-ascii chars
Allows use of more localised urls.
Closes  #233  
							
						 
						
							2016-11-12 17:16:52 +00:00  
				
					
						
							
							
								 
						
							
								d3c7aada89 
								
							 
						 
						
							
							
								
								Fixed attachments on draft pages  
							
							
							
						 
						
							2016-11-12 14:21:54 +00:00  
				
					
						
							
							
								 
						
							
								e639600ba5 
								
							 
						 
						
							
							
								
								Renamed files to attachments  
							
							
							
						 
						
							2016-11-12 14:12:26 +00:00  
				
					
						
							
							
								 
						
							
								600055bc73 
								
							 
						 
						
							
							
								
								Fixed tag searches and added tag search regression test  
							
							... 
							
							
							
							Fixes  #222  
						
							2016-11-12 13:21:16 +00:00  
				
					
						
							
							
								 
						
							
								672b15d36c 
								
							 
						 
						
							
							
								
								Fixed attachment base-url usage and non-existant images  
							
							... 
							
							
							
							Images now self-delete if the original file does not exist.
Prevents simply getting non-fixable errors.
Also cleaned some JS. 
							
						 
						
							2016-11-12 12:41:34 +00:00  
				
					
						
							
							
								 
						
							
								ac80723058 
								
							 
						 
						
							
							
								
								Merge fixes from branch 'v0.12'  
							
							
							
						 
						
							2016-11-12 11:40:54 +00:00  
				
					
						
							
							
								 
						
							
								ab468bac3c 
								
							 
						 
						
							
							
								
								Updated build and versioning system  
							
							... 
							
							
							
							Added versioning file instead of using git tags
(Step towards removing git as a dependancy in the future)
Updated gulpfile to fit with verisioning system and cleaned
up node dependancies.
Fixes  #108  
							
						 
						
							2016-10-30 17:44:00 +00:00  
				
					
						
							
							
								 
						
							
								b251671e3f 
								
							 
						 
						
							
							
								
								Amended search to not break on non-alpha-num chars  
							
							... 
							
							
							
							And also fixed exact term matches that contain non-alpha-num chars
Fixes  #212  
							
						 
						
							2016-10-30 12:08:22 +00:00  
				
					
						
							
							
								 
						
							
								8b43b91057 
								
							 
						 
						
							
							
								
								Improved password reset flow with notifications.  
							
							... 
							
							
							
							Also added links to sign-in/register.
Fixed links in emails sent out.
Fixes  #210  and #218 . 
							
						 
						
							2016-10-30 11:36:57 +00:00  
				
					
						
							
							
								 
						
							
								30458405ce 
								
							 
						 
						
							
							
								
								Page Attachments - Improved UI, Now initially complete  
							
							... 
							
							
							
							Closes  #62  
						
							2016-10-23 17:55:48 +01:00  
				
					
						
							
							
								 
						
							
								91220239e5 
								
							 
						 
						
							
							
								
								Added in attachment tests  
							
							
							
						 
						
							2016-10-23 15:25:04 +01:00  
				
					
						
							
							
								 
						
							
								7ee695d74a 
								
							 
						 
						
							
							
								
								File upload deletion complete & added extension handling  
							
							... 
							
							
							
							Also fixed issue with file editing on JS side 
							
						 
						
							2016-10-23 13:36:45 +01:00  
				
					
						
							
							
								 
						
							
								867fc8be64 
								
							 
						 
						
							
							
								
								Added basic attachment editing functionality  
							
							
							
						 
						
							2016-10-11 20:39:11 +01:00  
				
					
						
							
							
								 
						
							
								89509b487a 
								
							 
						 
						
							
							
								
								Added attachment creation from link/name  
							
							
							
						 
						
							2016-10-10 21:13:18 +01:00  
				
					
						
							
							
								 
						
							
								ac0b29fb6d 
								
							 
						 
						
							
							
								
								Added view, deletion and permissions for files  
							
							
							
						 
						
							2016-10-10 20:30:27 +01:00  
				
					
						
							
							
								 
						
							
								673c74ddfc 
								
							 
						 
						
							
							
								
								Started work on attachments  
							
							... 
							
							
							
							Created base models and started user-facing controls. 
							
						 
						
							2016-10-09 18:58:22 +01:00  
				
					
						
							
							
								 
						
							
								3b7d223b0c 
								
							 
						 
						
							
							
								
								Updated and added tests for new default user system  
							
							... 
							
							
							
							Closes  #138  
						
							2016-09-29 17:07:58 +01:00  
				
					
						
							
							
								 
						
							
								b662670efc 
								
							 
						 
						
							
							
								
								Prevented guest users creating draft pages.  
							
							
							
						 
						
							2016-09-29 15:56:57 +01:00  
				
					
						
							
							
								 
						
							
								771626b6ec 
								
							 
						 
						
							
							
								
								Started work on making the public role/user configurable  
							
							... 
							
							
							
							Create a new 'public' guest user and made the public
role visible on role setting screens. 
							
						 
						
							2016-09-29 12:43:46 +01:00  
				
					
						
							
							
								 
						
							
								f15cc5bdfa 
								
							 
						 
						
							
							
								
								Separated revision preview and diff & fixed chosen diff html  
							
							... 
							
							
							
							Closes  #8  
						
							2016-09-29 10:10:46 +01:00  
				
					
						
							
							
								 
						
							
								fff5bbcee4 
								
							 
						 
						
							
							
								
								Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff  
							
							
							
						 
						
							2016-09-29 09:32:40 +01:00  
				
					
						
							
							
								 
						
							
								42d8e9e5bd 
								
							 
						 
						
							
							
								
								Improved numeric term search capabilities  
							
							... 
							
							
							
							Prevented a quoted term also being added to fuzzy searches
and also added check to see if the term is numeric to check if
an exact match is required.
Closes  #200  
							
						 
						
							2016-09-29 09:13:15 +01:00  
				
					
						
							
							
								 
						
							
								1d681e53e4 
								
							 
						 
						
							
							
								
								Added page navigation and tweaked header styles  
							
							... 
							
							
							
							Changed header selection in editor to be more descriptive and
to provide a wider range of styles.
Closes  #68  
							
						 
						
							2016-09-18 14:49:36 +01:00  
				
					
						
							
							
								 
						
							
								e0235fda8b 
								
							 
						 
						
							
							
								
								Made registration gravatar/email requests fail gracefully  
							
							... 
							
							
							
							* Extracted any email confirmation text into langs.
* Added new notification on confirmation email send fail.
Closes  #187  
							
						 
						
							2016-09-17 21:33:55 +01:00  
				
					
						
							
							
								 
						
							
								9dc9724e15 
								
							 
						 
						
							
							
								
								Laravel 5.3 upgrade ( #189 )  
							
							... 
							
							
							
							* Started move to laravel 5.3
* Started updating login & registration flows for laravel 5.3 update
* Updated app emails to notification system
* Fixed registations bugs and removed email confirmation model
* Fixed large portion of laravel post-upgrade issues
* Fixed and tested LDAP process 
							
						 
						
							2016-09-17 18:22:04 +01:00  
				
					
						
							
							
								 
						
							
								bbd8fff021 
								
							 
						 
						
							
							
								
								Fixed bad image base-urls and forced tinyMCE to use absolute  
							
							... 
							
							
							
							Also ensured image file existance is checked during base64 conversion
during exports.
Closes  #171 . 
							
						 
						
							2016-09-03 19:24:58 +01:00  
				
					
						
							
							
								 
						
							
								ec17bd8608 
								
							 
						 
						
							
							
								
								Improved Exception handling, Removed npm requirement for testing  
							
							
							
						 
						
							2016-09-03 12:08:58 +01:00  
				
					
						
							
							
								 
						
							
								3f81eba13b 
								
							 
						 
						
							
							
								
								Updated travis testing to work with new helper configuration ( #175 )  
							
							... 
							
							
							
							* Updated travis to call phpunit globally rather then booting application first 
							
						 
						
							2016-08-27 11:27:23 +01:00  
				
					
						
							
							
								 
						
							
								7973412c29 
								
							 
						 
						
							
							
								
								Improved sort efficiency by a factor of 10  
							
							... 
							
							
							
							Fixes  #145  
						
							2016-08-26 20:20:58 +01:00  
				
					
						
							
							
								 
						
							
								f83de5f834 
								
							 
						 
						
							
							
								
								Fixed single word quoted search terms  
							
							... 
							
							
							
							Fixes  #170  
						
							2016-08-25 17:17:26 +01:00  
				
					
						
							
							
								 
						
							
								96c074bb56 
								
							 
						 
						
							
							
								
								Merge fixes from branch 'v0.11'  
							
							
							
						 
						
							2016-08-21 15:02:37 +01:00  
				
					
						
							
							
								 
						
							
								f8a299caee 
								
							 
						 
						
							
							
								
								Fixed login 'intended' redirect for custom urls.  
							
							... 
							
							
							
							Also changed social account detach wording. 
							
						 
						
							2016-08-21 14:49:40 +01:00  
				
					
						
							
							
								 
						
							
								437dce7756 
								
							 
						 
						
							
							
								
								Applied baseUrl to login redirect  
							
							
							
						 
						
							2016-08-21 13:48:56 +01:00  
				
					
						
							
							
								 
						
							
								632ecc668f 
								
							 
						 
						
							
							
								
								Applied baseUrl to login redirect  
							
							
							
						 
						
							2016-08-15 15:07:45 +01:00  
				
					
						
							
							
								 
						
							
								92d393537c 
								
							 
						 
						
							
							
								
								Merge branch 'v0.11'  
							
							
							
						 
						
							2016-08-14 13:09:44 +01:00