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

1177 Commits

Author SHA1 Message Date
Marcos 18e5f86ffa Updated Spanish translation 2018-08-12 14:14:56 +02:00
Dan Brown fcdb39e428
Merge pull request #942 from marcusforsberg/master 
Updated Swedish translation
 2018-08-12 12:51:00 +01:00
Dan Brown 1b3e1863f4
Merge pull request #948 from houbaron/fix/Chinese_translation 
Fix/Chinese translation
 2018-08-12 12:37:35 +01:00
Dan Brown fbc2175789
Merge pull request #952 from leomartinez/master 
Updated 'Spanish Argentina' translation.
 2018-08-12 12:36:28 +01:00
Leonardo Martinez 8099c431bb Updated 'Spanish Argentina' translation. 2018-08-06 10:46:53 -03:00
Baron Hou efbfe0f7af
Update Traditional Chinese 2018-08-05 17:07:13 +08:00
Baron Hou 66402b474c
Update Simplified Chinese 2018-08-05 17:05:41 +08:00
marcusforsberg f47f0e05d6 Updated Swedish translation 2018-07-30 09:35:34 +03: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
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
Abijeet f5df5ac7d5 Changes the way the date is displayed in image-manager. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-30 11:04:12 +05:30
Abijeet fb29f4119d Fixes issue with code not wrapping on revision page. 
Closes #888

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-30 09:49:55 +05:30
Timo B 93795b6eda add everything needed to use discord as social login provider 2018-06-28 09:01:36 +02:00
Leonardo Martinez f7b808a9e6 Merge remote-tracking branch 'upstream/master' 2018-06-26 09:37:20 -03:00
Abijeet Patro 448068e318
Merge pull request #892 from BookStackApp/fix/884 
Fixes issue with having to click the delete icon for attachment twice.
 2018-06-17 18:29:32 +05:30
Abijeet 7d81a95156 Fixes issue with having to click the delete icon for attachment twice. 
Fixes #884

This is happening because -

Due to the limitations of modern JavaScript (and the abandonment of Object.observe), Vue cannot detect property addition or deletion. Since Vue performs the getter/setter conversion process during instance initialization, a property must be present in the data object in order for Vue to convert it and make it reactive.

Source: https://vuejs.org/v2/guide/reactivity.html

Also added padding to the icons in the attachment section.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-17 14:21:31 +05:30
Leonardo Martinez a9bf2ed398 Updated 'Spanish Argentina' translation. 2018-06-13 10:12:36 -03:00
Abijeet 771f781e7f Fixes a corner case with exclamation in the ID. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:29:30 +05:30
Abijeet 78be8535f7 Removed previous code that is now unneeded 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:19:03 +05:30
Abijeet 6c4c1ccb58 Changed the way we were displaying the edit icon. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:06:23 +05:30
Abijeet 562225a77b Added code to set the cursor at end of line while scrolling. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 17:04:54 +05:30
Abijeet b936e1f403 Added code to handle scroll for markdown. 
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-10 13:11:10 +05:30
Dan Brown b3cc3130f0
Added copy button to codemirror-rendered code blocks 
Closes #858
 2018-06-09 10:41:01 +01:00
Abijeet 0363fc4ea1 Fixes undefined error when clicking on page navigation links. 
Fixes #873

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
 2018-06-03 14:24:55 +05:30