960 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Abijeet	f37509062e	Merge pull request #8 from OsmosysSoftware/feature-181 ... Issue 181	2017-07-12 18:41:35 +05:30
Nilesh Deepak	24ee78ccd8	Update.	2017-07-12 18:04:06 +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	f3b2e0fb91	Merge pull request #7 from OsmosysSoftware/revert-3-revert-1-issue-181 ... Revert "Revert "Bookstack grid view.""	2017-07-12 11:41:01 +05:30
Abijeet	844976c85b	Revert "Revert "Bookstack grid view.""	2017-07-12 11:40:50 +05:30
Abijeet	f0d914abbf	Merge pull request #5 from BookStackApp/master ... Getting latest changes	2017-07-12 11:33:58 +05:30
Dan Brown	2ea7e10923	Set ldap to not follow referrals by default ... Added LDAP_FOLLOW_REFERRALS .env option to override. Fixes #317	2017-07-10 19:43:49 +01:00
Dan Brown	e7f8188ee5	Prevented textarea styles interfering with codemirror ... Closes #424	2017-07-10 19:29:35 +01:00
Abijeet	0ed3023b42	Merge pull request #3 from OsmosysSoftware/revert-1-issue-181 ... Revert "Bookstack grid view."	2017-07-07 17:28:47 +05:30
Abijeet	3fd61a3600	Revert "Bookstack grid view."	2017-07-07 17:28:34 +05:30
Nilesh Deepak	a663fc8aa8	Merge pull request #1 from OsmosysSoftware/issue-181 ... Bookstack grid view issue 181.	2017-07-07 17:08:19 +05:30
Nilesh Deepak	d84315fff8	Indentation correction.	2017-07-07 17:06:08 +05:30
Nilesh Deepak	144a6e469d	Updated cover image upload and delete function.	2017-07-07 16:29:38 +05:30
Nilesh Deepak	c5f11e4516	Fixed pagination on change of display type.	2017-07-06 10:05:11 +05:30
Nilesh Deepak	16a09e8ff6	Deletion of image file on book deletion.	2017-07-06 10:03:40 +05:30
Nilesh Deepak	f51db4b9f6	Resolved responsiveness issues	2017-07-05 19:58:52 +05:30
Nilesh Deepak	6ad24a6bee	Changed public getImageURL function to private.	2017-07-05 18:32:38 +05:30
Nilesh Deepak	5b736c3b36	Updated views to support different languages.	2017-07-05 16:12:29 +05:30
Nilesh Deepak	cc553cc93d	Added labels for 'Thumbnail toggle' and 'Cover image' in different languages.	2017-07-05 16:11:15 +05:30
Nilesh Deepak	e88a06291e	Updated toggle thumbnails function.	2017-07-05 16:09:20 +05:30
Nilesh Deepak	6eccb3d5b9	Adding new migration.	2017-07-05 16:08:04 +05:30
Nilesh Deepak	026de8c5ca	Thumbnail toggle function.	2017-07-05 12:48:41 +05:30
Nilesh Deepak	e10d4b91cf	styles.scss	2017-07-05 12:36:26 +05:30
Nilesh Deepak	d089eaf754	Changes in User edit profile page.	2017-07-05 12:32:39 +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
Nilesh Deepak	bce5fdd5cd	Merge branch 'master' into issue-181	2017-07-04 15:16:46 +05:30
Nilesh Deepak	fdf139edb2	Changing column size for responsiveness	2017-07-04 15:04:57 +05:30
Dan Brown	314d98abc3	Removed logs, Updated version, Fixed inconsistent subheader	2017-07-02 20:33:32 +01:00
Dan Brown	b2dfc069c5	Updated readme attribution	2017-07-02 19:38:28 +01:00
Dan Brown	69c50b9b48	Migrated markdown editor actions to new cm editor	2017-07-02 19:35:13 +01:00
Dan Brown	f101e4f010	Fixed quoting db/table names in encoding migration. ... Also fixed incorrect if statement in db config.	2017-07-02 17:34:32 +01:00
Dan Brown	005f0eb4fc	Updated default encoding and added conversion migration. ... Also updated how DB port is defined so that the DB_PORT env var can be used or it can be take from the host name. Fixes #405	2017-07-02 17:30:12 +01:00
Dan Brown	7293ad7b24	Merge branch 'S64-japanese-translation'	2017-07-02 16:13:28 +01:00
Dan Brown	c5b58d8fd2	Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation	2017-07-02 16:09:12 +01:00
Dan Brown	4db2c274e2	Prevent empty-state actions visible without permission. ... Fixes #411	2017-07-02 15:59:40 +01:00
Dan Brown	cbff801aec	Added test to cover f99c8ff. ... Closes #409	2017-07-02 15:40:42 +01:00
Dan Brown	d5d83da766	Added diff and sh code types ... Verified changes to ensure fixes #296.	2017-07-01 16:10:52 +01:00
Dan Brown	de6d8a811c	Added quick lang-selection options to code editor	2017-07-01 15:50:28 +01:00
Dan Brown	a94844b6b7	Fixed code block selection and drag/drop issues	2017-07-01 15:38:11 +01:00
Dan Brown	968e7b8b72	Finished off main functionality of custom tinymce code editor	2017-07-01 13:23:46 +01:00
Shuma Yoshioka	5f461c9796	Add ja locale to config	2017-07-01 16:40:06 +09:00
Shuma Yoshioka	b2b8706d05	Translate errors.php	2017-07-01 16:38:43 +09:00
Shuma Yoshioka	2d345fe454	Translate entities.php	2017-07-01 16:38:20 +09:00
Shuma Yoshioka	7bec70d429	Translate common.php	2017-07-01 16:37:07 +09:00
Shuma Yoshioka	60710e7fb4	Translate auth.php	2017-07-01 16:33:54 +09:00
Shuma Yoshioka	f10d3a8564	Translate validation.php	2017-07-01 16:32:36 +09:00
Shuma Yoshioka	b020520366	Translate passwords.php	2017-07-01 16:32:02 +09:00