github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-12-18 09:53:52 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
1,400 Commits 10 Branches 201 Tags 89 MiB
5325870271
Commit Graph

325 Commits

Author SHA1 Message Date
Bharadwaja G
6200948eec Merge branch 'master' of git://github.com/BookStackApp/BookStack into BookStackApp-master 
Conflicts:
	app/Http/Controllers/BookController.php
	resources/lang/en/common.php
	resources/views/books/create.blade.php
	resources/views/books/form.blade.php
	resources/views/books/index.blade.php
	resources/views/users/edit.blade.php
	tests/Entity/EntityTest.php
 2017-08-29 12:19:00 +05:30
Dan Brown
55759bd22a
Added ability to set a page to view on the homepage. 
Relates to #372 and #126
 2017-08-28 13:38:32 +01:00
Dan Brown
d8e1f52ddd
Made new sidebar layout responsive 2017-08-27 15:16:51 +01:00
Dan Brown
4cb4c9e568
Updated remaining views to 2017 design update. 
Also fixed issue with duplicate confirmation email.
 2017-08-26 17:17:04 +01:00
Dan Brown
36f524a354
Updated page view styles to align with 2017 update 2017-08-26 15:41:33 +01:00
Dan Brown
5187d3fa78
Updated chapter views with new design 2017-08-26 14:36:48 +01:00
Dan Brown
8fcbe44d3e
Updated styles for auth and books views. 
Also added sourcemaps to gulp sass build
 2017-08-26 13:24:55 +01:00
Bharadwaja G
7f902e41c7 Resolved conflicts 2017-08-24 12:21:43 +05:30
Dan Brown
3da8c01c1f
Rolled out new design further 2017-08-20 13:57:25 +01:00
Dan Brown
295f520f21
Started design update 2017-08-19 18:32:24 +01:00
Dan Brown
fba7ae923d
Darkened a few cm code styles for improved legibility 2017-08-19 15:51:51 +01:00
Dan Brown
28a9bd514f
Updated header design 2017-08-19 15:33:22 +01:00
Dan Brown
666c86b108
Removed included fonts, Set to use system fonts. 
All font definitions moved into _text.scss.
Needs override documentation to complete.
Relates to #423.
 2017-08-19 14:33:55 +01:00
Dan Brown
194293664f
Removed v-show delayed content display 2017-08-19 14:09:03 +01:00
Dan Brown
afc66b3c3d
Migrated attachment manager to vue 2017-08-19 13:55:56 +01:00
Dan Brown
d3e4a1a6f9
Converted tag autosuggestion to vue component 2017-08-13 13:25:30 +01:00
Dan Brown
f338dbe3f8
Started vueifying tag system 2017-08-10 20:11:25 +01:00
Dan Brown
2a069880cd
Converted jQuery bits into raw JS components 2017-08-06 21:08:03 +01:00
Dan Brown
e9831a7507
Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master 2017-08-01 19:24:33 +01:00
Dan Brown
433cb9b3b2
Improved breadcrumb responsiveness 
Closes #426
 2017-07-22 15:20:36 +01:00
Dan Brown
7f43372dd4
Fixed broken code block rendering when using DOMPDF 
Fixes #427
 2017-07-22 14:34:17 +01:00
Nilesh Deepak
922964ecf2 Changes grid container size 2017-07-15 17:50:09 +05:30
Nilesh Deepak
dd4d2f4696 Resolves book heading issues in grid view. 2017-07-15 16:15:45 +05:30
Abijeet
21a8df78ee Merge pull request #9 from OsmosysSoftware/feature-181 
Feature 181
 2017-07-13 15:50:43 +05:30
Nilesh Deepak
7f8351e044 Removed avatar class from form.blade.php 2017-07-13 15:20:53 +05:30
Nilesh Deepak
afc1ecafe9 4. Changed the border color of the gallery item to #ccc 2017-07-13 12:27:14 +05:30
Nilesh Deepak
e919cab3d1 1. Thumbnail size when creating or editing book. 2017-07-13 12:22:43 +05:30
Abijeet
f37509062e Merge pull request #8 from OsmosysSoftware/feature-181 
Issue 181
 2017-07-12 18:41:35 +05:30
Nilesh Deepak
d37b398e79 Updates styles. 2017-07-12 13:52:21 +05:30
Nilesh Deepak
7a724f9134 Updated modifications. 2017-07-12 13:44:37 +05:30
Abijeet
844976c85b Revert "Revert "Bookstack grid view."" 2017-07-12 11:40:50 +05:30
Dan Brown
e7f8188ee5
Prevented textarea styles interfering with codemirror 
Closes #424
 2017-07-10 19:29:35 +01:00
Nilesh Deepak
144a6e469d Updated cover image upload and delete function. 2017-07-07 16:29:38 +05:30
Nilesh Deepak
f51db4b9f6 Resolved responsiveness issues 2017-07-05 19:58:52 +05:30
Nilesh Deepak
e10d4b91cf styles.scss 2017-07-05 12:36:26 +05:30
Nilesh Deepak
bb2d85965f Removed duplicated styles. 2017-07-05 12:29:16 +05:30
Nilesh Deepak
d99fd1fd65 Applied required changes 2017-07-05 12:26:02 +05:30
Nilesh Deepak
947c58f227 Applied required changes in BookStack. 2017-07-05 12:09:01 +05:30
Dan Brown
314d98abc3
Removed logs, Updated version, Fixed inconsistent subheader 2017-07-02 20:33:32 +01:00
Dan Brown
de6d8a811c
Added quick lang-selection options to code editor 2017-07-01 15:50:28 +01:00
Dan Brown
968e7b8b72
Finished off main functionality of custom tinymce code editor 2017-07-01 13:23:46 +01:00
Abijeet
06d75e1804 #47 - Updates the total comments when a comment is added. 2017-06-04 20:12:01 +05:30
Abijeet
0bda5554dd Getting the latest changes 2017-06-04 10:20:01 +05:30
Abijeet
860d4d4be5 #47 - Changes the way we are handling fetching of data for the comment section. 2017-05-30 09:02:47 +05:30
Dan Brown
88f93f76dd
Updated the markdown editor to use codemirror as editor 
Improved scroll sync system to be smarter
 2017-05-28 16:02:46 +01:00
Dan Brown
e5fc6bf5fa
Moved from highlight.js to codemirror 2017-05-28 13:16:21 +01:00
Abijeet
9a97995f18 #47 Displays the time for comments and border bottom for sub comments. 2017-05-25 08:04:19 +05:30
Abijeet
8b82753218 #47 - Gets rid of simplemde 2017-05-03 02:42:04 +05:30
Abijeet
d447355a61 Adding the view templates and styles. 2017-04-19 01:24:33 +05:30
Abijeet
8e2437498f Merge branch 'master' of https://github.com/Abijeet/BookStack 2017-04-19 01:23:27 +05:30
Abijeet
b3d4c199ae Merge branch 'master' of https://github.com/Abijeet/BookStack 
Conflicts:
	.gitignore
 2017-04-19 01:21:45 +05:30
Dan Brown
fde970ba59
Switched out markdown render 
Fixes #304.
Fixes #359.
 2017-04-17 12:21:10 +01:00
Dan Brown
1a09d88891
Added fade effect to page content highlighting 
Closes #314
 2017-04-16 16:46:55 +01:00
Dan Brown
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
Dan Brown
0e0945ef84
Finished off UI for search system 2017-04-15 15:04:30 +01:00
Dan Brown
ad125327c0
Migrated to custom gulp setup and conintue search interface 2017-04-14 18:47:33 +01:00
Dan Brown
1338ae2fc3
Started search interface, Added in vue and moved fonts 2017-04-09 20:59:57 +01:00
Dan Brown
22077d4181
Updated DOMPDF to latest version 2017-02-25 14:59:56 +00:00
Dan Brown
b0e849f413
Added checkbox sytax parsing to markdown lists 
Closes #319
 2017-02-25 13:16:26 +00:00
Dan Brown
86625a7642
Neatened up social login/register buttons 2017-02-05 15:28:53 +00:00
Dan Brown
ee495450cc
Improved multi-line callout rendering 
Closes #300
 2017-02-05 14:47:26 +00:00
Dan Brown
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
Dan Brown
80f844139c
Fixed missing subscript styling 
Closes #284
 2017-02-01 22:20:44 +00:00
Dan Brown
56d58ad8e5
Updated pointer to be able to show includes 
Also fixed pointer copying on flash-blocked browsers
 2017-01-21 14:58:03 +00:00
Dan Brown
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
Dan Brown
0faa130cfd
Fixed offset code blocks when editing in markdown. 
Fixes #264
 2017-01-08 13:31:53 +00:00
Dan Brown
3f0ef57d31
Added wkhtmltopdf support and done some style tweaks 
Closes #248
 2017-01-01 12:20:30 +00:00
Dan Brown
a24f3d7d47 Merge branch 'master' into translations 2016-12-31 14:32:52 +00:00
Dan Brown
c9700e38e2
Created solution for JS translations 
Also tidied up existing components and JS
 2016-12-31 14:27:40 +00:00
Dan Brown
05316c90ba
converted image picker to blade-based component 
Also updated some other JS translations
 2016-12-24 15:21:19 +00:00
Dan Brown
242dc21876
Converted toggle switch into a blade/jquery template 2016-12-22 19:41:32 +00:00
Dan Brown
96075dee7b
Extracted text from page views & standardised breadcrumbs 2016-12-03 18:35:40 +00:00
Dan Brown
286f9b0c7d
Moved page tags to sidebar 
Fixed #238
 2016-11-27 19:37:57 +00:00
Dan Brown
d3c7aada89
Fixed attachments on draft pages 2016-11-12 14:21:54 +00:00
Dan Brown
600055bc73
Fixed tag searches and added tag search regression test 
Fixes #222
 2016-11-12 13:21:16 +00:00
Dan Brown
ac80723058
Merge fixes from branch 'v0.12' 2016-11-12 11:40:54 +00:00
Dan Brown
5cfb7b8de4 Altered 'ol' element padding to not clip numbering 
Allows usage to 3-digits now
Closes #204
 2016-10-30 10:23:49 +00:00
Dan Brown
6329a1842a Fixed issue with callouts overflowing page tags 
Closes #179
 2016-10-30 10:19:45 +00:00
Dan Brown
30458405ce
Page Attachments - Improved UI, Now initially complete 
Closes #62
 2016-10-23 17:55:48 +01:00
Dan Brown
867fc8be64
Added basic attachment editing functionality 2016-10-11 20:39:11 +01:00
Dan Brown
673c74ddfc
Started work on attachments 
Created base models and started user-facing controls.
 2016-10-09 18:58:22 +01:00
Dan Brown
fff5bbcee4
Merge branch 'diff' of git://github.com/younes0/BookStack into younes0-diff 2016-09-29 09:32:40 +01:00
Dan Brown
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
Dan Brown
393f6047f2
Updated table styling to ideally by more predictable 
Set styles to be fixed and not cut text.
 2016-09-06 20:47:34 +01:00
Dan Brown
d94fc5b694
Fixed table cell p tag spacing and de-duped editor shortcuts 
Also changed shortcuts to be better compatible with OSX by using the
command key.
 2016-09-06 19:50:47 +01:00
Dan Brown
11960d9d3a
Cleaned page form JS & spaced tag box 
As per #174
 2016-09-05 19:33:14 +01:00
Dan Brown
0dbb8babee
Merge branch 'page_link_selector' 2016-09-03 10:40:27 +01:00
Dan Brown
b14e9fc619
Fixed some cross browser flexbox popup issues 
Set min height for poor IE & safari flexbox support.
Fixes #105.
 2016-09-03 10:32:14 +01:00
Dan Brown
781f0e7887
Added draft save indicator and fixed notification positions 2016-09-02 19:26:12 +01:00
Dan Brown
5b64358ef1
Added link selector interface to WYSIWYG editor 2016-09-01 20:36:22 +01:00
Dan Brown
56df64063d
Updated popup design and started integrating link selector 
Extracted design and base styles from image manager into generic popup
classes that can be used by other app components such as the new
popup Book/Chapter/Page link selector
 2016-08-30 20:05:59 +01:00
Dan Brown
96c074bb56
Merge fixes from branch 'v0.11' 2016-08-21 15:02:37 +01:00
Dan Brown
757f16a3b5
Improved page tag box structure and fixed footer in PDF export. 
Fixes #162.
 2016-08-21 13:35:22 +01:00
Dan Brown
92d393537c Merge branch 'v0.11' 2016-08-14 13:09:44 +01:00
Dan Brown
43d9d2eba7 Updated all application urls to allow path prefix. 
Allows BookStack to be installed at a non-root location on a domain.
Closes #40.
 2016-08-14 12:29:35 +01:00
Dan Brown
b157a9927a Fixed tag section and editor safari rendering. 
Fixes #152.
 2016-08-13 14:54:23 +01:00
Dan Brown
b246a67e8a Fixed double brace issues in both editors. 
Double braces were being parsed by angular in both the WYSIWYG and markdown editor.
Fixes #150 and fixes #155.
 2016-08-13 14:18:31 +01:00
Dan Brown
07c7d5af17 Updated elixr and fixed table th element borders 
Fixes #164.
 2016-08-13 10:02:54 +01:00
Dan Brown
7215392784 Changed when revisions are saved and update changelog input 
Revisions are now saved when te page content is originally saved whereas before they were saved on the next update to the page.
 2016-07-10 12:12:52 +01:00
Younès EL BIACHE
c279c6e2af replace GPL diff lib with MIT lib 
replace gpl lib with mit lib
 2016-07-10 12:01:05 +02:00
Younès EL BIACHE
6bc72e157a edit summary 2016-07-07 20:53:43 +02:00
Younès EL BIACHE
9537e2ae95 html diff in revision view 2016-07-07 19:54:40 +02:00
Dan Brown
c25ef18900 Made list default messages a little nicer 2016-07-03 10:12:12 +01:00
Dan Brown
b0a63ba0cc Tightened and cleaned some list styles 2016-07-03 09:58:45 +01:00
Dan Brown
bcd9c2044e Added WYSIWYG editor callouts 2016-06-19 19:02:53 +01:00
Dan Brown
7f99903fdb Finished off page move functionality 2016-06-12 12:14:14 +01:00
Dan Brown
97d011ac8e Started work on page move view and entity selector 2016-06-11 21:04:18 +01:00
Dan Brown
bd00a03e7b Added support for custom content in HTML head 2016-05-22 11:01:21 +01:00
Dan Brown
be517de7dc Added pagination, sorting & searching to users list 
As requested on #113
 2016-05-22 10:44:31 +01:00
Dan Brown
49621e7b15 Fixed flexbox overflow scrolling issues in firefox 
Fixes #111
 2016-05-22 09:08:37 +01:00
Dan Brown
e80ae76856 Added auto-suggestions to tag names and values 2016-05-15 20:12:53 +01:00
Dan Brown
7932069535 Added tags to page display and simplified editing flow 
Tags now save with the page content data
 2016-05-15 10:39:17 +01:00
Dan Brown
78564ec61d Cleaned up tag edit interface 2016-05-14 20:02:00 +01:00
Dan Brown
b80184cd93 Renamed attribute to tags & continued interface 
Also fixed page create route broken in last commit
 2016-05-13 21:20:21 +01:00
Dan Brown
1fa079b466 Started the page attributes interface 2016-05-12 23:12:05 +01:00
Dan Brown
9dc1b35e82 Made settings ui a little less jumpy 2016-04-24 10:28:47 +01:00
Dan Brown
8b36ca95a3 Improved font quality and cyrillic support 
Fixes dodgy font rendering on windows
 2016-04-20 19:11:33 +01:00
Dan Brown
a33deed26b Added user listing to role edit screen 2016-04-09 13:57:38 +01:00
Dan Brown
cbff2c6035 Added uploaded to book/page filters & search in image manager 
Also refactored tab styles which affected the settings area.

Closes #41
 2016-04-03 14:59:54 +01:00
Dan Brown
e9b596d3bc Merge bugfixes from branch 'v0.8' 2016-03-30 21:49:25 +01:00
Dan Brown
8b109bac13 Trimmed long names in header 
Fixes #87
 2016-03-30 21:28:38 +01:00
Dan Brown
dc2978824e Added basic system tests for markdown editor, Added extra test helpers 
Added test helpers for checking if an element exists / does not exist on a page.
Also fixed markdown editor bugs found while creating tests.
 2016-03-29 20:13:23 +01:00
Dan Brown
efb49019d4 Integrated the markdown editor with the image manager 2016-03-29 18:25:54 +01:00
Dan Brown
26965fa08f Added a markdown editor 2016-03-25 14:41:15 +00:00
Dan Brown
a06321675a Forced browser scrollbar, Added custom theme compatible logo 
Also removed link to search all pages if no pages mached search on global search page.
Closes #74.
 2016-03-13 14:00:24 +00:00
Dan Brown
75ecf1c44d Fixed inset chapter list colors 
The colors were being overridden by the custom theme color.
Styles added to force color to page and/or page draft.
 2016-03-13 12:43:42 +00:00
Dan Brown
5283919d24 Added new page drafts and started image entity attaching 
Closes #80.
 2016-03-13 12:04:08 +00:00
Dan Brown
ced8c8e497 Merged branch autosaving_drafts into master 2016-03-12 16:31:37 +00:00
Dan Brown
bf7852ce85 Organised test files & added page update draft tests 
Also cleaned styling for new autosave ui parts.
Closes #36.
 2016-03-12 16:31:02 +00:00
Dan Brown
30214fde74 Added UI components of page autosaving 2016-03-12 15:52:19 +00:00
Dan Brown
e9c213f803 Fixed firefox list editing bug and made button text size more consistent 
Fixes #77
 2016-03-09 23:23:28 +00:00
Dan Brown
e744d4c82c Changed color picker library and moved color logic to front end 
Since the old library was GPLv3 i changed the color picker to tiny-color-picker which is MIT.
Also extracted the styles to a shared view and move color calculation logic to javascript side.
 2016-03-06 10:52:10 +00:00
Dan Brown
8e6248f57f Added restriction tests and fixed any bugs in the process 
Also updated many styles within areas affected by the new permission and roles system.
 2016-03-05 18:09:21 +00:00
Dan Brown
c86a122d80 Added table header row styling, made code blocks horizontally scrollbable fixed link popup on firefox 2016-02-22 20:18:08 +00:00
Dan Brown
8eb2960950 Added recently created & updated page listings 
Closes #46.
 2016-02-20 18:51:01 +00:00
Dan Brown
bab6fd1f2f Added recent pages to home view and made the home content more compact 2016-02-20 12:37:06 +00:00
Dan Brown
4d9726dbdd Added content to user profile pages 2016-02-17 22:11:48 +00:00
Dan Brown
354912a1df Made book-navigation sidebar on pages sticky 2016-02-11 22:23:19 +00:00
Dan Brown
e0279f93f9 Added a back-to-top button on all pages 
The new back-to-top button will show after scrolling a short distance down a long page.
Closes #44.
 2016-02-08 20:42:41 +00:00
Dan Brown
9b83c57316 Fixed some design issues and improved page export styling 
Fixed alignment on export options dropdown.
Fixed bullet list items sitting too close next to floated content. Fixes #34.
Fixed text overlaying images in PDF exports (Floats removed for now). Fixes #53.
Fixed spaced table cells on html & PDF exports.
 2016-02-08 20:41:40 +00:00
Dan Brown
8296782149 Updated image controller styling and added preview option 
The notification system was also updated so it can be used from JavaScript events such as image manager uploads.

Closes #25
 2016-02-07 10:17:38 +00:00
Dan Brown
080acf0a62 Added plaintext & basic PDF page Export 2016-01-31 17:53:30 +00:00
Dan Brown
ea2e16cabb Added page HTML export 2016-01-20 22:13:13 +00:00
Dan Brown
e519236d94 Removed external fonts from page forms and remove initial form flicker 2015-12-31 17:19:29 +00:00
Dan Brown
5bf811a488 Sanitized user-text from angular & fixed some z-index bugs on pages 2015-12-30 21:38:20 +00:00
Dan Brown
3300edc51a Changed google cdn libs/fonts to local content. No external access is now required 2015-12-30 21:15:41 +00:00
Dan Brown
a592eaeb91 Updated page pointer to sit near mouse location and extracted page js into browserify bundle 2015-12-30 20:48:57 +00:00
Dan Brown
cca3533d35 Improved error messages for image uploads and formatted much js 2015-12-30 19:57:17 +00:00
Dan Brown
46c2e8b14e Moved all vuejs parts over to angular 2015-12-30 18:38:18 +00:00
Dan Brown
af33156369 Fixed name retrieval on missing users and added tests to cover along with some test helper methods 2015-12-15 19:27:36 +00:00