Commit Graph

749 Commits

Author SHA1 Message Date
1f6994b62c Added code for permissions, removed unnecessary code. 2017-08-20 21:26:44 +05:30
47d82a1ac2 Merge branch 'master' of https://github.com/BookStackApp/BookStack
Conflicts:
	resources/assets/js/vues/vues.js
2017-08-20 20:35:56 +05:30
703d579561 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:32 +05:30
ed375bfaf7 Refactored Angular code to instead use VueJS, left with permissions, testing and load testing. 2017-08-20 20:21:27 +05:30
3da8c01c1f Rolled out new design further 2017-08-20 13:57:25 +01:00
295f520f21 Started design update 2017-08-19 18:32:24 +01:00
fba7ae923d Darkened a few cm code styles for improved legibility 2017-08-19 15:51:51 +01:00
28a9bd514f Updated header design 2017-08-19 15:33:22 +01:00
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
194293664f Removed v-show delayed content display 2017-08-19 14:09:03 +01:00
039ee5d06c Aligned entity dash name and fixed chapter toggle on dash 2017-08-19 14:04:38 +01:00
afc66b3c3d Migrated attachment manager to vue 2017-08-19 13:55:56 +01:00
a04b31866d Cleaned social callback 2017-08-17 19:44:35 +01:00
db3dde98ef Merge pull request #474 from timoschwarzer/translation_update_de
Update and fix German translation
2017-08-17 18:51:35 +01:00
0d6a6b5b63 Update/fix german translation 2017-08-16 22:31:07 +02:00
4df3267521 Merge pull request #13 from BookStackApp/master
Getting the latest changes.
2017-08-14 23:09:26 +05:30
d3e4a1a6f9 Converted tag autosuggestion to vue component 2017-08-13 13:25:30 +01:00
b023699f1b Converted tag manager to be fully vue based 2017-08-13 11:50:40 +01:00
f338dbe3f8 Started vueifying tag system 2017-08-10 20:11:25 +01:00
ab07f7df6c Converted image manager into vue component 2017-08-09 21:33:00 +01:00
a59d73de7b Fixed bug causing image manager popup not to show 2017-08-07 19:32:31 +01:00
1ac7618bb1 Updated clipboard lib reference and version used 2017-08-06 21:21:20 +01:00
2a069880cd Converted jQuery bits into raw JS components 2017-08-06 21:08:03 +01:00
5e5928a8a6 Added vanilla JS component system 2017-08-06 18:01:49 +01:00
d6e87420c3 Merged comment migrations and incremented dev version 2017-08-01 20:05:49 +01:00
79cfd39fde Merge branch 'Abijeet-master' 2017-08-01 20:04:33 +01:00
e9831a7507 Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master 2017-08-01 19:24:33 +01:00
9126da6299 Updated dev command details
Closes #453
2017-07-28 11:32:42 +01:00
fea139d8e7 Merge branch 'master' of github.com:BookStackApp/BookStack 2017-07-27 19:09:44 +01:00
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
bbaa2f4cda Merge pull request #435 from JachuPL/polish-localization
Polish translation
2017-07-27 16:48:19 +01:00
9d61eecd81 Merge branch 'Cyber-Duck-master' 2017-07-27 16:29:09 +01:00
21247e10d0 Reverted travis changes and added html escaping 2017-07-27 16:28:23 +01:00
c1fc06ae34 Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master 2017-07-27 16:20:38 +01:00
a0eb3d1079 Merge pull request #446 from Joorem/french-spelling
French spelling
2017-07-27 16:18:57 +01:00
164aea3a3a Merge pull request #448 from 10bass/subdir-search-fix
Update search.js
2017-07-27 16:17:57 +01:00
ec83f83017 Added breadcrumbs to pages in entity select
Fixes #391
2017-07-27 16:10:58 +01:00
5cd08ab2f5 Fixed custom plugin when developing 2017-07-27 15:43:17 +01:00
072f6b103e Vastly sped up gulp watch and added livereload 2017-07-27 15:14:53 +01:00
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
0b2c3c1aa7 settings.php: add missing french translation 2017-07-22 23:45:09 +02:00
0dc9d0bed7 errors.php: add missing french translation 2017-07-22 23:45:09 +02:00
a2a2e37797 settings.php: fix some spelling issues in french translation 2017-07-22 23:45:09 +02:00
3d9819f97c passwords.php: fix some spelling issues in french translation 2017-07-22 23:45:09 +02:00
b2b4a24d7c errors.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
7557d6d619 entities.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
57eeb9b0a3 common.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
813c7d5902 auth.php: fix some spelling issues in french translation 2017-07-22 23:45:08 +02:00
f200b4183d Defined LDAP constant for testing without LDAP installed 2017-07-22 17:22:31 +01:00
33642c20ec Fixed faulty text rendering calls and LDAP tests 2017-07-22 17:10:52 +01:00