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
|
0a402e3c63
|
Made custom home ignore permissions and added tests
Closes #126 and #372
|
2017-08-28 13:55:39 +01:00 |
|
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
|
baea92b206
|
Migrated entity selector out of angular
|
2017-08-27 14:31:34 +01:00 |
|
Dan Brown
|
cfc05c1b22
|
Improved primary color control in settings
|
2017-08-27 12:59:56 +01:00 |
|
Dan Brown
|
ebf78d49a8
|
Merge pull request #480 from BookStackApp/design_update_2017
Design update 2017
|
2017-08-26 17:22:30 +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
|
b60d2190ac
|
Updated error views for redesign
|
2017-08-26 14:53:23 +01:00 |
|
Dan Brown
|
2f8b8c580d
|
Resolved current failing tests
|
2017-08-26 14:41:46 +01:00 |
|
Dan Brown
|
5187d3fa78
|
Updated chapter views with new design
|
2017-08-26 14:36:48 +01:00 |
|
Dan Brown
|
9c07741972
|
Updated readme with project definition
|
2017-08-26 13:49:56 +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
|
039ee5d06c
|
Aligned entity dash name and fixed chapter toggle on dash
|
2017-08-19 14:04:38 +01:00 |
|
Dan Brown
|
afc66b3c3d
|
Migrated attachment manager to vue
|
2017-08-19 13:55:56 +01:00 |
|
Dan Brown
|
a04b31866d
|
Cleaned social callback
|
2017-08-17 19:44:35 +01:00 |
|
Dan Brown
|
db3dde98ef
|
Merge pull request #474 from timoschwarzer/translation_update_de
Update and fix German translation
|
2017-08-17 18:51:35 +01:00 |
|
Timo Schwarzer
|
0d6a6b5b63
|
Update/fix german translation
|
2017-08-16 22:31:07 +02:00 |
|
Dan Brown
|
d3e4a1a6f9
|
Converted tag autosuggestion to vue component
|
2017-08-13 13:25:30 +01:00 |
|
Dan Brown
|
b023699f1b
|
Converted tag manager to be fully vue based
|
2017-08-13 11:50:40 +01:00 |
|
Dan Brown
|
f338dbe3f8
|
Started vueifying tag system
|
2017-08-10 20:11:25 +01:00 |
|
Dan Brown
|
ab07f7df6c
|
Converted image manager into vue component
|
2017-08-09 21:33:00 +01:00 |
|
Dan Brown
|
a59d73de7b
|
Fixed bug causing image manager popup not to show
|
2017-08-07 19:32:31 +01:00 |
|
Dan Brown
|
1ac7618bb1
|
Updated clipboard lib reference and version used
|
2017-08-06 21:21:20 +01:00 |
|
Dan Brown
|
2a069880cd
|
Converted jQuery bits into raw JS components
|
2017-08-06 21:08:03 +01:00 |
|
Dan Brown
|
5e5928a8a6
|
Added vanilla JS component system
|
2017-08-06 18:01:49 +01:00 |
|
Dan Brown
|
d6e87420c3
|
Merged comment migrations and incremented dev version
|
2017-08-01 20:05:49 +01:00 |
|
Dan Brown
|
79cfd39fde
|
Merge branch 'Abijeet-master'
|
2017-08-01 20:04:33 +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
|
9126da6299
|
Updated dev command details
Closes #453
|
2017-07-28 11:32:42 +01:00 |
|
Dan Brown
|
fea139d8e7
|
Merge branch 'master' of github.com:BookStackApp/BookStack
|
2017-07-27 19:09:44 +01:00 |
|
Dan Brown
|
ac7a8a8e1e
|
Expanded the available editor shortcuts in both editors
Adds formatting on ctrl+nums for everything on formats dropdown.
Closes #85.
|
2017-07-27 19:07:58 +01:00 |
|
Dan Brown
|
bbaa2f4cda
|
Merge pull request #435 from JachuPL/polish-localization
Polish translation
|
2017-07-27 16:48:19 +01:00 |
|
Dan Brown
|
9d61eecd81
|
Merge branch 'Cyber-Duck-master'
|
2017-07-27 16:29:09 +01:00 |
|
Dan Brown
|
21247e10d0
|
Reverted travis changes and added html escaping
|
2017-07-27 16:28:23 +01:00 |
|
Dan Brown
|
c1fc06ae34
|
Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master
|
2017-07-27 16:20:38 +01:00 |
|
Dan Brown
|
a0eb3d1079
|
Merge pull request #446 from Joorem/french-spelling
French spelling
|
2017-07-27 16:18:57 +01:00 |
|
Dan Brown
|
164aea3a3a
|
Merge pull request #448 from 10bass/subdir-search-fix
Update search.js
|
2017-07-27 16:17:57 +01:00 |
|
Dan Brown
|
ec83f83017
|
Added breadcrumbs to pages in entity select
Fixes #391
|
2017-07-27 16:10:58 +01:00 |
|
Dan Brown
|
5cd08ab2f5
|
Fixed custom plugin when developing
|
2017-07-27 15:43:17 +01:00 |
|
Dan Brown
|
072f6b103e
|
Vastly sped up gulp watch and added livereload
|
2017-07-27 15:14:53 +01:00 |
|
10bass
|
b4dcde252b
|
Update search.js
Trying to apply an exact match or tag would previously redirect to /search, regardless of the installation path.
|
2017-07-24 20:06:15 -04:00 |
|