Commit Graph

  • 005f0eb4fc Updated default encoding and added conversion migration. Dan Brown 2017-07-02 17:20:05 +01:00
  • 7293ad7b24 Merge branch 'S64-japanese-translation' Dan Brown 2017-07-02 16:13:28 +01:00
  • c5b58d8fd2 Merge branch 'japanese-translation' of git://github.com/S64/BookStack into S64-japanese-translation Dan Brown 2017-07-02 16:09:12 +01:00
  • 4db2c274e2 Prevent empty-state actions visible without permission. Dan Brown 2017-07-02 15:59:40 +01:00
  • cbff801aec Added test to cover f99c8ff. Dan Brown 2017-07-02 15:40:42 +01:00
  • d5d83da766 Added diff and sh code types Dan Brown 2017-07-01 16:10:52 +01:00
  • de6d8a811c Added quick lang-selection options to code editor Dan Brown 2017-07-01 15:50:28 +01:00
  • a94844b6b7 Fixed code block selection and drag/drop issues Dan Brown 2017-07-01 15:38:11 +01:00
  • 968e7b8b72 Finished off main functionality of custom tinymce code editor Dan Brown 2017-07-01 13:23:46 +01:00
  • 5f461c9796 Add ja locale to config Shuma Yoshioka 2017-07-01 16:29:12 +09:00
  • b2b8706d05 Translate errors.php Shuma Yoshioka 2017-07-01 16:38:43 +09:00
  • 2d345fe454 Translate entities.php Shuma Yoshioka 2017-07-01 16:38:20 +09:00
  • 7bec70d429 Translate common.php Shuma Yoshioka 2017-07-01 16:37:07 +09:00
  • 60710e7fb4 Translate auth.php Shuma Yoshioka 2017-07-01 16:33:54 +09:00
  • f10d3a8564 Translate validation.php Shuma Yoshioka 2017-07-01 16:29:43 +09:00
  • b020520366 Translate passwords.php Shuma Yoshioka 2017-07-01 16:29:35 +09:00
  • 52010e5820 Translate pagination.php Shuma Yoshioka 2017-07-01 16:29:28 +09:00
  • af72f0d490 Bookstack grid view. Nilesh Deepak 2017-06-29 18:54:04 +05:30
  • 8924618d12 test Nilesh Deepak 2017-06-28 18:56:17 +05:30
  • 6557fbb666 commit Nilesh Deepak 2017-06-28 18:51:32 +05:30
  • 75eca03b05 Translate settings.php Shuma Yoshioka 2017-06-24 20:49:06 +09:00
  • b8ebefd803 Translate components.php Shuma Yoshioka 2017-06-24 20:47:41 +09:00
  • 168c66815e add ja to settings Shuma Yoshioka 2017-06-24 20:44:45 +09:00
  • 26e703a1cd translate activities.php Shuma Yoshioka 2017-06-19 00:02:09 +09:00
  • c8be214ee0 Started tinymce code editor components Dan Brown 2017-06-17 15:07:55 +01:00
  • 2060cdb931 Added code highlighting syntax modes Dan Brown 2017-06-17 12:41:18 +01:00
  • 574ee820a9 #47 - Fixes the issues with the test case. Abijeet 2017-06-13 02:37:50 +05:30
  • 7d02f77e67 #47 - Added more test cases to test the APIs and permission for comments. Abijeet 2017-06-13 02:31:17 +05:30
  • fd50efb503 #47 - Putting the comments right under the page. Abijeet 2017-06-11 11:41:33 +05:30
  • 9dbd7fa618 #47 - Adding comments to the dummy content seeder. Abijeet 2017-06-11 11:40:37 +05:30
  • 8dab31b87a Merge branch 'master' of https://github.com/Abijeet/BookStack Abijeet 2017-06-10 22:56:07 +05:30
  • e155c52256 #47 - Fixes a few issues with the code. Abijeet 2017-06-10 22:55:36 +05:30
  • c76e7c706c adding a comment on top. Abijeet Patro 2017-06-10 19:47:45 +05:30
  • 552943c033 #47 - Undos changes in config files. Abijeet 2017-06-10 19:46:00 +05:30
  • 4efe3b41da #47 - Added translations for other language files using Google translate. Abijeet 2017-06-10 15:21:28 +05:30
  • 218376a41c #47 - Fetching values from language files. Abijeet 2017-06-08 01:30:43 +05:30
  • e647ec22b1 #47 - Adds direct linking to comments. Abijeet 2017-06-08 01:14:53 +05:30
  • 38fe756725 #47 - Fixes a couple of issues found during testing - delete not updating the UI, delete none not working properly. Abijeet 2017-06-07 23:45:29 +05:30
  • 652a67ad65 Removes some unncessary code. Abijeet 2017-06-06 23:20:40 +05:30
  • 5bd9da6054 #47 - Adds various translations in English, and a few code improvements. Abijeet 2017-06-06 01:46:59 +05:30
  • 7c6fe8c4e2 #47 - Changes the location of the reply and edit comment box. Abijeet 2017-06-05 00:20:37 +05:30
  • 689d1eb082 #47 - Adds a cancel button for edit and reply button. Abijeet 2017-06-04 20:43:56 +05:30
  • 06d75e1804 #47 - Updates the total comments when a comment is added. Abijeet 2017-06-04 20:12:01 +05:30
  • 0528e98d9c Merge branch 'v0.16' Dan Brown 2017-06-04 15:39:55 +01:00
  • 3903fda6ca Incremented version v0.16.3 Dan Brown 2017-06-04 15:38:49 +01:00
  • 441e46ebaa Merge branch 'v0.16' into release Dan Brown 2017-06-04 15:38:29 +01:00
  • f99c8ff99a Fixed role permission removal bug Dan Brown 2017-06-04 15:37:10 +01:00
  • 9558f84b97 #47 - Adds functionality to delete a comment. Also reduces the number of watchers. Abijeet 2017-06-04 18:52:44 +05:30
  • 2fd421b115 #47 - Adds comment level permissions to the front-end. Abijeet 2017-06-04 11:17:14 +05:30
  • 6ff440e677 Merge branch 'BookStackApp-master' Abijeet 2017-06-04 10:20:25 +05:30
  • 0bda5554dd Getting the latest changes Abijeet 2017-06-04 10:20:01 +05:30
  • 860d4d4be5 #47 - Changes the way we are handling fetching of data for the comment section. Abijeet 2017-05-30 09:02:47 +05:30
  • 88f93f76dd Updated the markdown editor to use codemirror as editor Dan Brown 2017-05-28 16:02:46 +01:00
  • e5fc6bf5fa Moved from highlight.js to codemirror Dan Brown 2017-05-28 13:16:21 +01:00
  • 8990a9817f Updated tinymce to latest version Dan Brown 2017-05-28 11:57:58 +01:00
  • 9a97995f18 #47 Displays the time for comments and border bottom for sub comments. Abijeet 2017-05-25 08:04:19 +05:30
  • 1a1e71cd60 #47 Adds two attributes updated and created to display time to user. Abijeet 2017-05-25 08:03:27 +05:30
  • 34802ff8a6 #47 Inserts null for updated_at when the user is creating a comment. Abijeet 2017-05-25 08:02:49 +05:30
  • 0ff5aad9c0 #47 Hides the reply button based if comments are 2 levels deep. Abijeet 2017-05-24 07:02:11 +05:30
  • 03e5d61798 #47 Implements the reply and edit functionality for comments. Abijeet 2017-05-16 00:40:14 +05:30
  • 4f231d1bf0 Merge pull request #11 from BookStackApp/master Abijeet Patro 2017-05-15 22:25:33 +05:30
  • 1f4260f359 Updated version for release v0.16.2 v0.16.2 Dan Brown 2017-05-07 19:35:51 +01:00
  • dc0bf8ad4e Merge branch 'master' into release Dan Brown 2017-05-07 19:35:34 +01:00
  • 75981c2412 Fixed chapter check for non-mysqlnd instances Dan Brown 2017-05-07 19:34:11 +01:00
  • 8b82753218 #47 - Gets rid of simplemde Abijeet 2017-05-03 02:42:04 +05:30
  • 3368fe42d8 Merge pull request #10 from BookStackApp/master Abijeet Patro 2017-05-03 01:41:08 +05:30
  • 102e326e6a Updated JS and version for release v0.16.1 v0.16.1 Dan Brown 2017-04-30 19:51:23 +01:00
  • 2b25bf6f3b Merge branch 'master' into release Dan Brown 2017-04-30 19:50:29 +01:00
  • f8ae4c335e Made single entity updates more efficent Dan Brown 2017-04-30 19:10:49 +01:00
  • 5570e858e5 Made more efficiency improvements to permission system Dan Brown 2017-04-30 11:38:58 +01:00
  • 1859a4d356 Refactored permission system components Dan Brown 2017-04-29 22:01:43 +01:00
  • ad4642c2c4 Enabled translation when not logged in Dan Brown 2017-04-29 16:47:41 +01:00
  • 92108d710d Re-enabled html in markdown editor Dan Brown 2017-04-29 16:10:38 +01:00
  • c3ea0d333e #47 - Adds functionality to display child comments. Also has some code towards the reply functionality. Abijeet 2017-04-27 02:35:29 +05:30
  • f93280696d Updated assets for release v0.16 v0.16.0 Dan Brown 2017-04-23 20:42:28 +01:00
  • 1787391b07 Merge branch 'master' into release Dan Brown 2017-04-23 20:41:45 +01:00
  • 44347ee353 Fixed search system id clash Dan Brown 2017-04-23 20:27:49 +01:00
  • 9e704fcae4 Updated testing database connection issue Dan Brown 2017-04-23 17:51:01 +01:00
  • fdd816b17d Merge pull request #362 from DaneEveritt/patch-1 Dan Brown 2017-04-23 17:15:06 +01:00
  • 82e2c523e6 Fixed chapter breadcrumbs and testing issues Dan Brown 2017-04-22 14:08:12 +01:00
  • a323b0d49c Allowed child entity permissions to override parent permissions Dan Brown 2017-04-22 13:39:34 +01:00
  • 4c985aac7e Added page revision counting Dan Brown 2017-04-20 20:58:54 +01:00
  • 87e18b8068 Merge pull request #357 from diegoseso/master Dan Brown 2017-04-19 06:40:00 +01:00
  • 607a2c91fc Fixing encoding of files affecting accents. Diego Jose Sosa Diaz 2017-04-18 23:41:19 +02:00
  • d447355a61 Adding the view templates and styles. Abijeet 2017-04-19 01:24:33 +05:30
  • 8e2437498f Merge branch 'master' of https://github.com/Abijeet/BookStack Abijeet 2017-04-19 01:23:27 +05:30
  • 9de85283cd Merge pull request #9 from BookStackApp/master Abijeet Patro 2017-04-19 01:23:21 +05:30
  • b3d4c199ae Merge branch 'master' of https://github.com/Abijeet/BookStack Abijeet 2017-04-19 01:21:45 +05:30
  • fde970ba59 Switched out markdown render Dan Brown 2017-04-17 12:21:10 +01:00
  • ec7be1b08b Merge pull request #363 from solidnerd/add-env-for-logging Dan Brown 2017-04-17 11:46:32 +01:00
  • 746a760a23 Add APP_LOGGING solidnerd 2017-04-17 09:55:11 +02:00
  • 1a09d88891 Added fade effect to page content highlighting Dan Brown 2017-04-16 16:46:55 +01:00
  • 46c01ecba2 Merge pull request #358 from jendrol/master Dan Brown 2017-04-16 15:06:32 +01:00
  • 544ece03a5 Merge pull request #360 from Abijeet/spellcheck-fix Dan Brown 2017-04-16 15:02:20 +01:00
  • 5fee7c4db1 Merge pull request #340 from BookStackApp/search_system Dan Brown 2017-04-16 11:01:00 +01:00
  • 8ed9f75d57 Fixed model extending mis-use Dan Brown 2017-04-16 10:54:23 +01:00
  • a15b179676 Updated testcases for new search system. Dan Brown 2017-04-16 10:47:44 +01:00
  • 73844b9eeb Enabled type search filter in book search Dan Brown 2017-04-15 19:31:11 +01:00
  • dcde599709 Added chapter search Dan Brown 2017-04-15 19:16:07 +01:00
  • 0e0945ef84 Finished off UI for search system Dan Brown 2017-04-15 15:04:30 +01:00