colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,750 Commits 1 Branch 0 Tags 48 MiB
Commit Graph

1750 Commits

Author SHA1 Message Date
Dan Brown c3986cedfc
Added shelve icon, improved migration, added role permission 
Icon is placeholder for now
Migration will now copy permissions from Books to apply to shelves.
Role view updated with visibility on shelve permission
 2018-08-04 12:45:45 +01:00
Dan Brown b5a2d3c1c4
Merge remote-tracking branch 'origin' into bookshelves 2018-08-04 11:35:01 +01:00
Khalid a6862362c1 added Arabic to locales 2018-08-03 19:00:51 +03:00
Khalid 7d4ec0d633 added Arabic language to drop-down list. 2018-08-03 18:58:27 +03:00
Khalid 85544c04a9 translated 2018-08-03 18:51:18 +03:00
Khalid 0a8ff6ffad translated 2018-08-03 18:34:39 +03:00
Khalid 04274078c4 translated 2018-08-02 06:38:33 +03:00
Khalid aac9fbf236 translated 2018-08-01 18:25:44 +03:00
Khalid 08e290f3ea translated 2018-07-30 12:58:12 +03:00
Khalid 86602854ac translated 2018-07-30 12:54:32 +03:00
marcusforsberg f47f0e05d6 Updated Swedish translation 2018-07-30 09:35:34 +03:00
Dan Brown 4bdec0d214
Updated version and assets for release v0.23 2018-07-29 20:28:49 +01:00
Dan Brown 6a7d7e7c2b
Merge branch 'master' into release 2018-07-29 20:26:00 +01:00
Dan Brown c83a51f7e2
Merge pull request #904 from lommes/903-socialite-discord 
add everything needed to use discord as social login provider
 2018-07-29 16:18:10 +01:00
Dan Brown b922c8029e
Merge pull request #933 from nicobubulle/master 
French translation update
 2018-07-29 16:04:39 +01:00
Dan Brown 653761e67d
Merge pull request #925 from alex2702/fix/835 
Fixed German translations for notifications
 2018-07-29 16:03:29 +01:00
Dan Brown d59ff132ab
Delete ISSUE_TEMPLATE.md 2018-07-29 15:55:13 +01:00
Dan Brown e6e740b2a1 Update issue templates 2018-07-29 15:54:53 +01:00
Dan Brown af6f4e6c8c
Updated pagination to use theme colour 2018-07-29 15:44:10 +01:00
Dan Brown 69a0f8d502
Prevented error notification being visible on load 
Fixes #897

Also made design a little more compact
 2018-07-29 15:34:54 +01:00
Dan Brown 6d35fb5237
Updated packages via npm audit 2018-07-28 15:03:29 +01:00
Khalid 6eb63a1e03 translated 2018-07-28 14:13:12 +03:00
Khalid 8774f1a320 translated 2018-07-28 13:02:19 +03:00
Khalid 6ca8ccd330 translated 2018-07-28 12:47:35 +03:00
Khalid df88ffa159 translated 2018-07-28 00:13:33 +03:00
Khalid dcbb8ad960 translated 2018-07-24 21:40:49 +03:00
Khalid 0f2ffa9545 translated to Arabic 2018-07-24 21:36:12 +03:00
Khalid 6bae16f7e9 fully translated "common" and partially translated "entities" 2018-07-24 18:11:55 +03:00
kmoj86 f5ca7ab1c8
Update entities.php 2018-07-23 18:19:17 +03:00
Khalid 7dd11decb8 partial file translation 2018-07-23 13:08:07 +03:00
nicobubulle 79d0f707e6 French translation update 2018-07-22 18:20:09 +02:00
alex2702 369dc02e78 Fixed German translations for notifications 2018-07-15 21:26:55 +02:00
Dan Brown 9d2e65b73d
Merge branch 'brennanmurphy-master' 2018-07-15 19:36:28 +01:00
Dan Brown f421d83627
Added ability to set custom ldap group -> role mapping 
Added input in role form to allow matching against custom names.
Changed default mapping to use role display name instead of the hidden
DB name.
 2018-07-15 19:34:42 +01:00
Dan Brown be2ca9d4bb
Refactored out the LDAP repo 2018-07-15 18:21:45 +01:00
Dan Brown 17bca662a7
Added tests to cover ldap group mapping 
Also updated .env.example formatting.
Updated how LdapRepo uses Ldap so can be mocked by testing.
 2018-07-15 17:57:25 +01:00
Dan Brown 1776204870
Merge branch 'master' of git://github.com/brennanmurphy/BookStack into brennanmurphy-master 2018-07-14 14:17:55 +01:00
Dan Brown 985e214d94
Merge branch 'master' of github.com:BookStackApp/BookStack 2018-07-14 14:14:37 +01:00
Dan Brown 2bcc159fd6
Allowed creating pages in visible chapters in invisible books 
Fixes permissions with test to cover in the event a page is created,
with permission, in a chapter but the user does not have permission to
see the parent book.

Fixes #912
 2018-07-14 14:12:29 +01:00
Dan Brown fb7c12438d
Merge pull request #918 from DeehSlash/fix/pt_br_locale 
Adds missing pt_BR strings
 2018-07-14 10:31:18 +01:00
Dan Brown b2cd363539
Added browserlist, Tweaked md scrollToText ot use ES6 2018-07-14 10:20:49 +01:00
Dan Brown f668bee88b
Merge branch 'master' into feature/edit-link-headers 2018-07-14 09:36:14 +01:00
André Luiz da Silva 642f2760cc Improves and adds missing pt_BR strings 2018-07-10 15:10:21 -03:00
Brennan Murphy 37aa8b05f8 Update files to PSR-2 standards 2018-07-02 17:27:43 +00:00
Brennan Murphy d640cc1eee LDAP groups sync to Bookstack roles. 
Closes #75
 2018-07-02 17:09:39 +00:00
Abijeet Patro c2d6e98985
Merge pull request #907 from BookStackApp/fix/date-image-manager 
Changes the way the date is displayed in image-manager.
 2018-07-02 00:34:30 +05:30
Dan Brown 84b4fe6176
Merge pull request #886 from leomartinez/master 
Updated 'Spanish Argentina' translation.
 2018-07-01 16:21:38 +01:00
Dan Brown decdf5714b
Merge pull request #865 from moucho/master 
New strings from 0.22 release for Spanish translation
 2018-07-01 16:20:47 +01:00
Dan Brown 9da600caf9
Merge pull request #906 from BookStackApp/bug/revision-wrap 
Fixes issue with code not wrapping on revision page.
 2018-07-01 16:18:49 +01:00
Dan Brown 45aee2a1c1
Merge pull request #874 from BookStackApp/fix/gototext 
Fixes undefined error when clicking on link under page navigation.
 2018-07-01 16:13:10 +01:00