Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sergix44/XBackBone
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.5
Choose a base ref
...
head repository: sergix44/XBackBone
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Feb 10, 2019

  1. Update README.md

    sergix44 authored Feb 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    f20874c View commit details

Commits on Mar 3, 2019

  1. Updated js deps

    sergix44 committed Mar 3, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    7de2b75 View commit details

Commits on Mar 30, 2019

  1. Update league/flysystem (#25)

    violinist-bot authored and sergix44 committed Mar 30, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    ba61c3d View commit details

Commits on Apr 6, 2019

  1. Update slim/twig-view (#26)

    violinist-bot authored and sergix44 committed Apr 6, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    86ee13a View commit details

Commits on Apr 10, 2019

  1. Improved partial content implementation

    Fixed issue #27
    sergix44 committed Apr 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    5f274cb View commit details
  2. Update CHANGELOG.md

    sergix44 authored Apr 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    f433103 View commit details

Commits on Apr 17, 2019

  1. Update slim/slim (#29)

    violinist-bot authored and sergix44 committed Apr 17, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    d02bc0a View commit details

Commits on May 6, 2019

  1. Improved session error handling

    Added check for the minimum php version
    Package update and cleanup
    sergix44 committed May 6, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    0ce9bde View commit details

Commits on May 8, 2019

  1. Added preloading

    Avoid to load big text files
    Other improvements
    sergix44 committed May 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    abe3733 View commit details
  2. Update CHANGELOG.md

    sergix44 authored May 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    619d200 View commit details

Commits on May 9, 2019

  1. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    ba3de85 View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    d8d45da View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    37d65db View commit details
  4. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    6a90d9a View commit details
  5. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    a79ef5c View commit details

Commits on May 12, 2019

  1. Update phpstan/phpstan (#34)

    violinist-bot authored and sergix44 committed May 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    9c926bb View commit details
  2. Fixed bad css loading on Firefox (#35)

    Fixed wrong style for publish/unpublish button
    sergix44 committed May 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    c192028 View commit details
  3. Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    67c9d82 View commit details
  4. Improved exception logging

    sergix44 committed May 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    de42f2e View commit details
  5. Update CHANGELOG.md

    sergix44 authored May 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Copy the full SHA
    65b7464 View commit details
  6. Bump version

    sergix44 committed May 12, 2019
    Copy the full SHA
    ba91b9e View commit details
  7. Copy the full SHA
    635cffe View commit details

Commits on May 19, 2019

  1. Start adding support to use AWS S3, Google Cloud Storage, Dropbox and…

    … FTP(s) accounts as storage location
    sergix44 committed May 19, 2019
    Copy the full SHA
    f6a6be7 View commit details
  2. Added some html in the template

    (should be close once completed #37)
    sergix44 committed May 19, 2019
    Copy the full SHA
    abd4534 View commit details
  3. Update phpstan/phpstan (#38)

    violinist-bot authored and sergix44 committed May 19, 2019
    Copy the full SHA
    3a61057 View commit details

Commits on May 23, 2019

  1. Update league/flysystem (#39)

    violinist-bot authored and sergix44 committed May 23, 2019
    Copy the full SHA
    141e9d3 View commit details
  2. Create FUNDING.yml

    sergix44 authored May 23, 2019
    Copy the full SHA
    55cd988 View commit details
  3. Improved install wizard

    sergix44 committed May 23, 2019
    Copy the full SHA
    f47bc32 View commit details

Commits on May 30, 2019

  1. Update phpstan/phpstan (#40)

    violinist-bot authored and sergix44 committed May 30, 2019
    Copy the full SHA
    10fc619 View commit details
  2. Copy the full SHA
    99ba444 View commit details

Commits on Jun 22, 2019

  1. Update league/flysystem (#43)

    violinist-bot authored and sergix44 committed Jun 22, 2019
    Copy the full SHA
    5105b02 View commit details
  2. Copy the full SHA
    4d21604 View commit details

Commits on Jun 26, 2019

  1. Update intervention/image (#44)

    violinist-bot authored and sergix44 committed Jun 26, 2019
    Copy the full SHA
    b99630c View commit details

Commits on Jul 7, 2019

  1. Update phpstan/phpstan (#45)

    violinist-bot authored and sergix44 committed Jul 7, 2019
    Copy the full SHA
    0259d56 View commit details

Commits on Jul 9, 2019

  1. Copy the full SHA
    53a36d6 View commit details
  2. Copy the full SHA
    c89bd9c View commit details
  3. Improved response checking in linux script

    Added check that prevents throwing a JSON parsing error when the server is down
    Kombustor authored Jul 9, 2019
    Copy the full SHA
    1d8f588 View commit details
  4. Copy the full SHA
    8d3af80 View commit details

Commits on Jul 10, 2019

  1. Merge pull request #49 from Kombustor/master

    Improved linux uploading script
    sergix44 authored Jul 10, 2019
    Copy the full SHA
    1d401bc View commit details
  2. Update phpstan/phpstan (#48)

    violinist-bot authored and sergix44 committed Jul 10, 2019
    Copy the full SHA
    9007fbe View commit details

Commits on Jul 29, 2019

  1. Update README.md

    sergix44 authored Jul 29, 2019
    Copy the full SHA
    87c7318 View commit details

Commits on Aug 18, 2019

  1. Update README.md

    sergix44 authored Aug 18, 2019
    Copy the full SHA
    bb39e58 View commit details
  2. Update phpstan/phpstan (#52)

    violinist-bot authored and sergix44 committed Aug 18, 2019
    Copy the full SHA
    0d34194 View commit details
  3. Update phpstan/phpstan (#53)

    violinist-bot authored and sergix44 committed Aug 18, 2019
    Copy the full SHA
    e544266 View commit details
  4. Update from Weblate (#55)

    * Added translation using Weblate (Norwegian Bokmål)
    
    * Translated using Weblate (Norwegian Bokmål)
    
    Currently translated at 80.9% (76 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/nb_NO/
    
    * Translated using Weblate (Italian)
    
    Currently translated at 100.0% (94 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/it/
    
    * Added translation using Weblate (German)
    
    * Deleted translation using Weblate (German)
    
    * Added translation using Weblate (German)
    
    * Translated using Weblate (German)
    
    Currently translated at 0.0% (0 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/de/
    weblate authored and sergix44 committed Aug 18, 2019
    Copy the full SHA
    41334ed View commit details
  5. Update README.md

    sergix44 authored Aug 18, 2019
    Copy the full SHA
    716774d View commit details
  6. Update README.md

    sergix44 authored Aug 18, 2019
    Copy the full SHA
    c980bf8 View commit details

Commits on Aug 19, 2019

  1. Update phpstan/phpstan (#57)

    violinist-bot authored and sergix44 committed Aug 19, 2019
    Copy the full SHA
    dc109c4 View commit details
  2. Update from Weblate (#59)

    * Added translation using Weblate (Greek)
    
    * Added translation using Weblate (Spanish)
    
    * Added translation using Weblate (French)
    
    * Added translation using Weblate (Japanese)
    
    * Added translation using Weblate (Dutch)
    
    * Added translation using Weblate (Polish)
    
    * Added translation using Weblate (Portuguese)
    
    * Added translation using Weblate (Romanian)
    
    * Added translation using Weblate (Russian)
    
    * Translated using Weblate (German)
    
    Currently translated at 98.9% (93 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/de/
    
    * Translated using Weblate (Greek)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/el/
    
    * Translated using Weblate (Russian)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/ru/
    
    * Translated using Weblate (Romanian)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/ro/
    
    * Translated using Weblate (Japanese)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/ja/
    
    * Translated using Weblate (Portuguese)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/pt/
    
    * Translated using Weblate (Polish)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/pl/
    
    * Translated using Weblate (Italian)
    
    Currently translated at 100.0% (94 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/it/
    
    * Translated using Weblate (Dutch)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/nl/
    
    * Translated using Weblate (Spanish)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/es/
    
    * Translated using Weblate (French)
    
    Currently translated at 1.1% (1 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/fr/
    
    * Translated using Weblate (Norwegian Bokmål)
    
    Currently translated at 80.9% (76 of 94 strings)
    
    Translation: XBackBone/XBackBone
    Translate-URL: https://hosted.weblate.org/projects/xbackbone/xbackbone/nb_NO/
    weblate authored and sergix44 committed Aug 19, 2019
    Copy the full SHA
    d791343 View commit details

Commits on Aug 20, 2019

  1. Improved lang handling

    sergix44 committed Aug 20, 2019
    Copy the full SHA
    5af7567 View commit details
Showing with 24,093 additions and 6,415 deletions.
  1. +8 −0 .github/FUNDING.yml
  2. +5 −1 .github/ISSUE_TEMPLATE/bug_report.md
  3. +27 −0 .github/workflows/test_suite.yml
  4. BIN .github/xbackbone.png
  5. +7 −5 .gitignore
  6. +3 −3 .htaccess
  7. +469 −85 CHANGELOG.md
  8. +95 −31 Gruntfile.js
  9. +36 −129 README.md
  10. +5 −0 SECURITY.md
  11. +101 −59 app/Controllers/AdminController.php
  12. +123 −0 app/Controllers/Auth/AuthController.php
  13. +183 −0 app/Controllers/Auth/LoginController.php
  14. +130 −0 app/Controllers/Auth/PasswordRecoveryController.php
  15. +126 −0 app/Controllers/Auth/RegisterController.php
  16. +156 −0 app/Controllers/ClientController.php
  17. +140 −48 app/Controllers/Controller.php
  18. +82 −65 app/Controllers/DashboardController.php
  19. +49 −0 app/Controllers/ExportController.php
  20. +0 −79 app/Controllers/LoginController.php
  21. +549 −0 app/Controllers/MediaController.php
  22. +74 −0 app/Controllers/ProfileController.php
  23. +115 −0 app/Controllers/SettingController.php
  24. +79 −0 app/Controllers/TagController.php
  25. +0 −44 app/Controllers/ThemeController.php
  26. +186 −135 app/Controllers/UpgradeController.php
  27. +239 −389 app/Controllers/UploadController.php
  28. +310 −411 app/Controllers/UserController.php
  29. +57 −120 app/Database/DB.php
  30. +111 −0 app/Database/Migrator.php
  31. +0 −227 app/Database/Queries/MediaQuery.php
  32. +387 −0 app/Database/Repositories/MediaRepository.php
  33. +106 −0 app/Database/Repositories/TagRepository.php
  34. +181 −0 app/Database/Repositories/UserRepository.php
  35. +27 −0 app/Exceptions/Handlers/AppErrorHandler.php
  36. +50 −0 app/Exceptions/Handlers/Renderers/HtmlErrorRenderer.php
  37. +0 −15 app/Exceptions/MaintenanceException.php
  38. +0 −15 app/Exceptions/UnauthorizedException.php
  39. +13 −0 app/Exceptions/UnderMaintenanceException.php
  40. +30 −0 app/Exceptions/ValidationException.php
  41. +71 −0 app/Factories/ViewFactory.php
  42. +21 −19 app/Middleware/AdminMiddleware.php
  43. +24 −23 app/Middleware/AuthMiddleware.php
  44. +20 −18 app/Middleware/CheckForMaintenanceMiddleware.php
  45. +23 −0 app/Middleware/InjectMiddleware.php
  46. +27 −0 app/Middleware/LangMiddleware.php
  47. +13 −32 app/Middleware/Middleware.php
  48. +41 −0 app/Middleware/RememberMiddleware.php
  49. +153 −110 app/Web/Lang.php
  50. +152 −0 app/Web/Mail.php
  51. +153 −100 app/Web/Session.php
  52. +67 −0 app/Web/Theme.php
  53. +55 −0 app/Web/UA.php
  54. +66 −0 app/Web/ValidationHelper.php
  55. +69 −0 app/Web/View.php
  56. +497 −240 app/helpers.php
  57. +78 −40 app/routes.php
  58. +4 −4 bin/clean
  59. +26 −70 bin/migrate
  60. +0 −34 bin/theme
  61. +105 −137 bootstrap/app.php
  62. +113 −0 bootstrap/container.php
  63. +40 −14 composer.json
  64. +6,848 −481 composer.lock
  65. +12 −8 config.example.php
  66. +1 −0 docs/CNAME
  67. +8 −0 docs/_config.yml
  68. +1 −0 docs/_includes/head_custom.html
  69. +1 −0 docs/ads.txt
  70. +31 −0 docs/basic_usage.md
  71. +470 −0 docs/changelog.md
  72. +48 −0 docs/clients.md
  73. +20 −0 docs/common_issues.md
  74. +214 −0 docs/configuration.md
  75. BIN docs/favicon.ico
  76. BIN docs/img/xbackbone.png
  77. +57 −0 docs/index.md
  78. +68 −0 docs/installation.md
  79. +21 −0 docs/license.md
  80. +22 −0 docs/sponsor.md
  81. +34 −0 docs/upgrading.md
  82. BIN favicon.ico
  83. +6 −4 index.php
  84. +238 −192 install/index.php
  85. +152 −37 install/templates/install.twig
  86. +4 −0 nginx.conf
  87. +2,494 −1,184 package-lock.json
  88. +16 −12 package.json
  89. +33 −0 phpunit.xml
  90. +165 −0 resources/lang/ar.lang.php
  91. +164 −0 resources/lang/bg.lang.php
  92. +163 −0 resources/lang/ca.lang.php
  93. +163 −0 resources/lang/cs.lang.php
  94. +164 −0 resources/lang/da.lang.php
  95. +170 −0 resources/lang/de.lang.php
  96. +163 −95 resources/lang/en.lang.php
  97. +170 −0 resources/lang/es.lang.php
  98. +29 −0 resources/lang/fa.lang.php
  99. +164 −0 resources/lang/fi.lang.php
  100. +166 −0 resources/lang/fr.lang.php
  101. +164 −0 resources/lang/fr_CA.lang.php
  102. +66 −0 resources/lang/hi.lang.php
  103. +164 −0 resources/lang/hu.lang.php
  104. +165 −0 resources/lang/id.lang.php
  105. +164 −95 resources/lang/it.lang.php
  106. +114 −0 resources/lang/ja.lang.php
  107. +164 −0 resources/lang/ko.lang.php
  108. +163 −0 resources/lang/lt.lang.php
  109. +166 −0 resources/lang/nb_NO.lang.php
  110. +170 −0 resources/lang/nl.lang.php
  111. +166 −0 resources/lang/pl.lang.php
  112. +166 −0 resources/lang/pt.lang.php
  113. +163 −0 resources/lang/ro.lang.php
  114. +170 −0 resources/lang/ru.lang.php
  115. +164 −0 resources/lang/sr.lang.php
  116. +165 −0 resources/lang/sv.lang.php
  117. +165 −0 resources/lang/ta.lang.php
  118. +165 −0 resources/lang/tr.lang.php
  119. +163 −0 resources/lang/vi.lang.php
  120. +164 −0 resources/lang/zh_Hans.lang.php
  121. +5 −0 resources/schemas/mysql/mysql.3.sql
  122. +7 −0 resources/schemas/mysql/mysql.4.sql
  123. +8 −0 resources/schemas/mysql/mysql.5.sql
  124. +18 −0 resources/schemas/mysql/mysql.6.sql
  125. +3 −0 resources/schemas/mysql/mysql.7.sql
  126. +4 −0 resources/schemas/sqlite/sqlite.3.sql
  127. +6 −0 resources/schemas/sqlite/sqlite.4.sql
  128. +11 −0 resources/schemas/sqlite/sqlite.5.sql
  129. +20 −0 resources/schemas/sqlite/sqlite.6.sql
  130. +3 −0 resources/schemas/sqlite/sqlite.7.sql
  131. +27 −7 resources/templates/auth/login.twig
  132. +60 −0 resources/templates/auth/recover_mail.twig
  133. +51 −0 resources/templates/auth/recover_password.twig
  134. +65 −0 resources/templates/auth/register.twig
  135. +57 −20 resources/templates/base.twig
  136. +1 −1 resources/templates/comp/alert.twig
  137. +19 −0 resources/templates/comp/modal_delete.twig
  138. +19 −0 resources/templates/comp/modal_vanity.twig
  139. +21 −8 resources/templates/comp/navbar.twig
  140. +8 −0 resources/templates/comp/recaptcha.twig
  141. +17 −0 resources/templates/dashboard/changelog.twig
  142. +73 −0 resources/templates/dashboard/grid.twig
  143. +0 −62 resources/templates/dashboard/home.twig
  144. +33 −18 resources/templates/dashboard/{admin.twig → list.twig}
  145. +25 −9 resources/templates/dashboard/pager_header.twig
  146. +131 −23 resources/templates/dashboard/system.twig
  147. +14 −0 resources/templates/errors/400.twig
  148. +1 −1 resources/templates/errors/405.twig
  149. +1 −1 resources/templates/errors/500.twig
  150. +52 −0 resources/templates/scripts/xbackbone_kde_uploader.sh.twig
  151. +49 −15 resources/templates/scripts/xbackbone_uploader.sh.twig
  152. +101 −37 resources/templates/upload/public.twig
  153. +36 −0 resources/templates/upload/web.twig
  154. +44 −25 resources/templates/user/create.twig
  155. +75 −32 resources/templates/user/edit.twig
  156. +18 −22 resources/templates/user/index.twig
  157. +156 −0 resources/uploaders/screencloud/main.py
  158. +7 −0 resources/uploaders/screencloud/metadata.xml
  159. +92 −0 resources/uploaders/screencloud/settings.ui
  160. +163 −31 src/css/app.css
  161. BIN src/images/android-chrome-192x192.png
  162. BIN src/images/android-chrome-512x512.png
  163. BIN src/images/apple-touch-icon.png
  164. +9 −0 src/images/browserconfig.xml
  165. BIN src/images/favicon-16x16.png
  166. BIN src/images/favicon-32x32.png
  167. BIN src/images/favicon.ico
  168. BIN src/images/mstile-150x150.png
  169. +1 −0 src/images/safari-pinned-tab.svg
  170. +19 −0 src/images/site.webmanifest
  171. +187 −21 src/js/app.js
  172. +70 −0 src/js/installer.js
  173. +131 −0 tests/Feature/Auth/LoginControllerTest.php
  174. +140 −0 tests/Feature/Auth/PasswordRecoveryControllerTest.php
  175. +126 −0 tests/Feature/Auth/RegisterControllerTest.php
  176. +71 −0 tests/TestCase.php
  177. +107 −0 tests/WithApplication.php
  178. +7 −0 tests/bootstrap.php
  179. +16 −0 tests/config.test.php
  180. +0 −1,272 yarn.lock
8 changes: 8 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# These are supported funding model platforms

github: [SergiX44]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: #
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
custom: #
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,8 @@ assignees: ''
**System Info**
+ PHP Version:
+ XBackBone Version:
+ Webserver:
+ Webserver: [Apache/Nginx/...]
+ Database backend: [SQLite/Mysql/...]

**Describe the bug**
A clear and concise description of what the bug is.
@@ -27,3 +28,6 @@ A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Logs**
XBackBone and/or webserver logs.
27 changes: 27 additions & 0 deletions .github/workflows/test_suite.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: PHP Composer

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ["7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]

steps:
- uses: actions/checkout@v2

- name: Validate composer.json and composer.lock
run: composer validate --no-check-version

- name: Install dependencies
run: composer install --no-progress

- name: Run test suite
run: vendor/bin/phpunit --no-coverage
Binary file added .github/xbackbone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 7 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -2,13 +2,10 @@
composer.phar
/vendor/

# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
composer.lock

### grunt ###
# Grunt usually compiles files inside this directory
dist/
release*.zip

# Grunt usually preprocesses files such as coffeescript, compass... inside the .tmp directory
.tmp/
@@ -77,6 +74,7 @@ typings/
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/dictionaries
@@ -130,10 +128,14 @@ fabric.properties
# Repo file
storage/
static/
install/installer.js
!resources/cache/.gitkeep
resources/cache/*
resources/database/*.db
resources/sessions/sess_*
logs/log-*.txt
config.php
release.zip
release.zip
/.settings/
/.project
/.buildpath
6 changes: 3 additions & 3 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Options -Indexes
Options -Indexes +SymLinksIfOwnerMatch
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteRule ^(app|bin|bootstrap|resources|storage|vendor|logs)(/.*|)$ - [NC,F]
RewriteRule ^(app|bin|bootstrap|resources|storage|vendor|logs|CHANGELOG.md)(/.*|)$ - [NC,F]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php [QSA,L]
</IfModule>
</IfModule>
Loading