Advertisement
HC_

SP-38

HC_
Mar 30th, 2019
143
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 29.30 KB | None | 0 0
  1. Updating 04a364dc..934512d0
  2. Fast-forward
  3. .env.example | 89 +-
  4. .env.example.complete | 222 +++
  5. app/{ => Actions}/Activity.php | 5 +-
  6. app/{Services => Actions}/ActivityService.php | 8 +-
  7. app/{ => Actions}/Comment.php | 4 +-
  8. app/{Repos => Actions}/CommentRepo.php | 21 +-
  9. app/{ => Actions}/Tag.php | 4 +-
  10. app/{Repos => Actions}/TagRepo.php | 17 +-
  11. app/{ => Actions}/View.php | 4 +-
  12. app/{Services => Actions}/ViewService.php | 17 +-
  13. app/{Services => Auth/Access}/EmailConfirmationService.php | 16 +-
  14. app/{Services => Auth/Access}/Ldap.php | 25 +-
  15. app/{Services => Auth/Access}/LdapService.php | 74 +-
  16. app/{Services => Auth/Access}/SocialAuthService.php | 32 +-
  17. app/{ => Auth/Permissions}/EntityPermission.php | 4 +-
  18. app/{ => Auth/Permissions}/JointPermission.php | 6 +-
  19. app/{Services => Auth/Permissions}/PermissionService.php | 161 +-
  20. app/{Repos => Auth/Permissions}/PermissionsRepo.php | 12 +-
  21. app/{ => Auth/Permissions}/RolePermission.php | 5 +-
  22. app/{ => Auth}/Role.php | 15 +-
  23. app/{ => Auth}/SocialAccount.php | 4 +-
  24. app/{ => Auth}/User.php | 4 +-
  25. app/{Repos => Auth}/UserRepo.php | 82 +-
  26. app/Console/Commands/CleanupImages.php | 4 +-
  27. app/Console/Commands/ClearActivity.php | 2 +-
  28. app/Console/Commands/ClearRevisions.php | 2 +-
  29. app/Console/Commands/CreateAdmin.php | 4 +-
  30. app/Console/Commands/DeleteUsers.php | 4 +-
  31. app/Console/Commands/RegeneratePermissions.php | 4 +-
  32. app/Console/Commands/RegenerateSearch.php | 4 +-
  33. app/{ => Entities}/Book.php | 13 +-
  34. app/{ => Entities}/Bookshelf.php | 13 +-
  35. app/{ => Entities}/Chapter.php | 11 +-
  36. app/{ => Entities}/Entity.php | 41 +-
  37. app/Entities/EntityProvider.php | 87 +
  38. app/{Services => Entities}/ExportService.php | 21 +-
  39. app/{ => Entities}/Page.php | 15 +-
  40. app/{ => Entities}/PageRevision.php | 5 +-
  41. app/{ => Entities}/Repos/EntityRepo.php | 722 ++-----
  42. app/Entities/Repos/PageRepo.php | 508 +++++
  43. app/{Services => Entities}/SearchService.php | 112 +-
  44. app/{ => Entities}/SearchTerm.php | 4 +-
  45. app/Exceptions/Handler.php | 6 +-
  46. app/Exceptions/HttpFetchException.php | 7 +
  47. app/Exceptions/NotifyException.php | 2 +-
  48. app/Exceptions/UserUpdateException.php | 5 +
  49. app/{Services => }/Facades/Activity.php | 2 +-
  50. app/{Services => }/Facades/Images.php | 2 +-
  51. app/{Services => }/Facades/Setting.php | 2 +-
  52. app/{Services => }/Facades/Views.php | 2 +-
  53. app/Http/Controllers/AttachmentController.php | 8 +-
  54. app/Http/Controllers/Auth/LoginController.php | 10 +-
  55. app/Http/Controllers/Auth/RegisterController.php | 24 +-
  56. app/Http/Controllers/BookController.php | 14 +-
  57. app/Http/Controllers/BookshelfController.php | 13 +-
  58. app/Http/Controllers/ChapterController.php | 10 +-
  59. app/Http/Controllers/CommentController.php | 8 +-
  60. app/Http/Controllers/Controller.php | 4 +-
  61. app/Http/Controllers/HomeController.php | 13 +-
  62. app/Http/Controllers/ImageController.php | 14 +-
  63. app/Http/Controllers/PageController.php | 150 +-
  64. app/Http/Controllers/PermissionController.php | 4 +-
  65. app/Http/Controllers/SearchController.php | 10 +-
  66. app/Http/Controllers/SettingController.php | 2 +-
  67. app/Http/Controllers/TagController.php | 2 +-
  68. app/Http/Controllers/UserController.php | 27 +-
  69. app/Http/Middleware/Localization.php | 48 +
  70. app/Http/Middleware/TrustProxies.php | 2 +-
  71. app/Notifications/ConfirmEmail.php | 35 +-
  72. app/Notifications/MailNotification.php | 34 +
  73. app/Notifications/ResetPassword.php | 22 +-
  74. app/Ownable.php | 2 +
  75. app/Providers/AppServiceProvider.php | 37 +-
  76. app/Providers/AuthServiceProvider.php | 2 +-
  77. app/Providers/BroadcastServiceProvider.php | 1 -
  78. app/Providers/CustomFacadeProvider.php | 22 +-
  79. app/Providers/EventServiceProvider.php | 1 -
  80. app/Providers/LdapUserProvider.php | 8 +-
  81. app/Providers/RouteServiceProvider.php | 1 -
  82. app/Providers/TranslationServiceProvider.php | 31 +
  83. app/{ => Settings}/Setting.php | 4 +-
  84. app/{Services => Settings}/SettingService.php | 9 +-
  85. app/Translation/Translator.php | 72 +
  86. app/{ => Uploads}/Attachment.php | 7 +-
  87. app/{Services => Uploads}/AttachmentService.php | 12 +-
  88. app/Uploads/HttpFetcher.php | 33 +
  89. app/{ => Uploads}/Image.php | 3 +-
  90. app/{Repos => Uploads}/ImageRepo.php | 12 +-
  91. app/{Services => Uploads}/ImageService.php | 78 +-
  92. app/{Services => Uploads}/UploadService.php | 4 +-
  93. app/helpers.php | 36 +-
  94. composer.json | 13 +-
  95. composer.lock | 929 +++++++--
  96. config/app.php | 218 +--
  97. config/auth.php | 94 +-
  98. config/broadcasting.php | 38 +-
  99. config/cache.php | 46 +-
  100. config/compile.php | 35 -
  101. config/database.php | 116 +-
  102. config/dompdf.php | 18 +-
  103. config/filesystems.php | 69 +-
  104. config/mail.php | 131 +-
  105. config/queue.php | 48 +-
  106. config/services.php | 35 +-
  107. config/session.php | 195 +-
  108. config/setting-defaults.php | 21 +-
  109. config/snappy.php | 8 +
  110. config/view.php | 54 +-
  111. database/factories/ModelFactory.php | 18 +-
  112. database/migrations/2015_12_07_195238_add_image_upload_types.php | 2 +-
  113. database/migrations/2018_08_04_115700_create_bookshelves_table.php | 12 +-
  114. database/seeds/DummyContentSeeder.php | 28 +-
  115. database/seeds/LargeContentSeeder.php | 14 +-
  116. package-lock.json | 13978 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------
  117. package.json | 40 +-
  118. phpunit.xml | 3 +
  119. public/dist/app.js | 68 +-
  120. public/dist/export-styles.css | 9 +-
  121. public/dist/print-styles.css | 9 +
  122. public/dist/styles.css | 19 +-
  123. public/libs/tinymce/plugins/autosave/plugin.min.js | 2 +-
  124. public/libs/tinymce/plugins/help/plugin.min.js | 2 +-
  125. public/libs/tinymce/plugins/image/plugin.min.js | 2 +-
  126. public/libs/tinymce/plugins/imagetools/plugin.min.js | 2 +-
  127. public/libs/tinymce/plugins/lists/plugin.min.js | 2 +-
  128. public/libs/tinymce/plugins/paste/plugin.min.js | 2 +-
  129. public/libs/tinymce/plugins/searchreplace/plugin.min.js | 2 +-
  130. public/libs/tinymce/plugins/spellchecker/plugin.min.js | 2 +-
  131. public/libs/tinymce/plugins/table/plugin.min.js | 2 +-
  132. public/libs/tinymce/plugins/template/plugin.min.js | 2 +-
  133. public/libs/tinymce/plugins/textpattern/plugin.min.js | 2 +-
  134. public/libs/tinymce/plugins/visualchars/plugin.min.js | 2 +-
  135. public/libs/tinymce/plugins/wordcount/plugin.min.js | 2 +-
  136. public/libs/tinymce/skins/lightgray/fonts/tinymce.eot | Bin 18808 -> 18912 bytes
  137. public/libs/tinymce/skins/lightgray/fonts/tinymce.svg | 1 +
  138. public/libs/tinymce/skins/lightgray/fonts/tinymce.ttf | Bin 18644 -> 18748 bytes
  139. public/libs/tinymce/skins/lightgray/fonts/tinymce.woff | Bin 18720 -> 18824 bytes
  140. public/libs/tinymce/skins/lightgray/skin.min.css | 2 +-
  141. public/libs/tinymce/themes/inlite/theme.min.js | 2 +-
  142. public/libs/tinymce/themes/mobile/theme.min.js | 2 +-
  143. public/libs/tinymce/themes/modern/theme.min.js | 2 +-
  144. public/libs/tinymce/tinymce.min.js | 4 +-
  145. readme.md | 46 +-
  146. resources/assets/js/components/{back-top-top.js => back-to-top.js} | 2 +-
  147. resources/assets/js/components/chapter-toggle.js | 2 +-
  148. resources/assets/js/components/collapsible.js | 2 +-
  149. resources/assets/js/components/dropdown.js | 2 +-
  150. resources/assets/js/components/editor-toolbox.js | 2 +-
  151. resources/assets/js/components/entity-selector-popup.js | 2 +-
  152. resources/assets/js/components/entity-selector.js | 2 +-
  153. resources/assets/js/components/expand-toggle.js | 2 +-
  154. resources/assets/js/components/homepage-control.js | 2 +-
  155. resources/assets/js/components/image-picker.js | 2 +-
  156. resources/assets/js/components/index.js | 65 +-
  157. resources/assets/js/components/markdown-editor.js | 60 +-
  158. resources/assets/js/components/notification.js | 2 +-
  159. resources/assets/js/components/overlay.js | 2 +-
  160. resources/assets/js/components/page-comments.js | 4 +-
  161. resources/assets/js/components/page-display.js | 17 +-
  162. resources/assets/js/components/page-picker.js | 2 +-
  163. resources/assets/js/components/shelf-sort.js | 6 +-
  164. resources/assets/js/components/sidebar.js | 2 +-
  165. resources/assets/js/components/toggle-switch.js | 2 +-
  166. resources/assets/js/components/wysiwyg-editor.js | 49 +-
  167. resources/assets/js/services/code.js | 48 +-
  168. resources/assets/js/services/drawio.js | 2 +-
  169. resources/assets/js/services/events.js | 2 +-
  170. resources/assets/js/services/translations.js | 2 +-
  171. resources/assets/js/vues/attachment-manager.js | 6 +-
  172. resources/assets/js/vues/code-editor.js | 4 +-
  173. resources/assets/js/vues/components/autosuggest.js | 2 +-
  174. resources/assets/js/vues/components/dropzone.js | 32 +-
  175. resources/assets/js/vues/entity-dashboard.js | 2 +-
  176. resources/assets/js/vues/image-manager.js | 10 +-
  177. resources/assets/js/vues/page-editor.js | 2 +-
  178. resources/assets/js/vues/search.js | 2 +-
  179. resources/assets/js/vues/tag-manager.js | 6 +-
  180. resources/assets/js/vues/vues.js | 24 +-
  181. resources/assets/sass/_components.scss | 7 +-
  182. resources/assets/sass/_pages.scss | 11 +-
  183. resources/assets/sass/_tinymce.scss | 5 +
  184. resources/assets/sass/print-styles.scss | 12 +
  185. resources/lang/ar/errors.php | 1 +
  186. resources/lang/cs/activities.php | 48 +
  187. resources/lang/cs/auth.php | 65 +
  188. resources/lang/cs/common.php | 59 +
  189. resources/lang/cs/components.php | 33 +
  190. resources/lang/cs/entities.php | 294 +++
  191. resources/lang/cs/errors.php | 84 +
  192. resources/lang/cs/pagination.php | 12 +
  193. resources/lang/cs/passwords.php | 15 +
  194. resources/lang/cs/settings.php | 117 ++
  195. resources/lang/cs/validation.php | 152 ++
  196. resources/lang/de/activities.php | 44 +-
  197. resources/lang/de/entities.php | 33 +
  198. resources/lang/de/errors.php | 2 +
  199. resources/lang/de/passwords.php | 8 +-
  200. resources/lang/de_informal/activities.php | 6 +
  201. resources/lang/de_informal/auth.php | 47 +
  202. resources/lang/de_informal/common.php | 9 +
  203. resources/lang/de_informal/components.php | 10 +
  204. resources/lang/de_informal/entities.php | 64 +
  205. resources/lang/de_informal/errors.php | 32 +
  206. resources/lang/de_informal/pagination.php | 6 +
  207. resources/lang/de_informal/passwords.php | 6 +
  208. resources/lang/de_informal/settings.php | 38 +
  209. resources/lang/de_informal/validation.php | 6 +
  210. resources/lang/en/activities.php | 10 +-
  211. resources/lang/en/auth.php | 29 +-
  212. resources/lang/en/common.php | 27 +-
  213. resources/lang/en/components.php | 11 +-
  214. resources/lang/en/entities.php | 48 +-
  215. resources/lang/en/errors.php | 11 +-
  216. resources/lang/en/pagination.php | 17 +-
  217. resources/lang/en/passwords.php | 17 +-
  218. resources/lang/en/settings.php | 54 +-
  219. resources/lang/en/validation.php | 46 +-
  220. resources/lang/es/activities.php | 10 +-
  221. resources/lang/es/auth.php | 31 +-
  222. resources/lang/es/common.php | 29 +-
  223. resources/lang/es/components.php | 11 +-
  224. resources/lang/es/entities.php | 50 +-
  225. resources/lang/es/errors.php | 10 +-
  226. resources/lang/es/pagination.php | 17 +-
  227. resources/lang/es/passwords.php | 17 +-
  228. resources/lang/es/settings.php | 38 +-
  229. resources/lang/es/validation.php | 44 +-
  230. resources/lang/es_AR/activities.php | 8 +
  231. resources/lang/es_AR/common.php | 1 +
  232. resources/lang/es_AR/entities.php | 37 +
  233. resources/lang/es_AR/errors.php | 3 +
  234. resources/lang/es_AR/settings.php | 4 +-
  235. resources/lang/es_AR/validation.php | 1 +
  236. resources/lang/format.php | 330 ++++
  237. resources/lang/fr/activities.php | 8 +
  238. resources/lang/fr/common.php | 1 +
  239. resources/lang/fr/entities.php | 36 +
  240. resources/lang/fr/errors.php | 2 +
  241. resources/lang/fr/settings.php | 5 +-
  242. resources/lang/it/errors.php | 1 +
  243. resources/lang/ja/errors.php | 1 +
  244. resources/lang/kr/activities.php | 40 +
  245. resources/lang/kr/auth.php | 76 +
  246. resources/lang/kr/common.php | 68 +
  247. resources/lang/kr/components.php | 34 +
  248. resources/lang/kr/entities.php | 311 +++
  249. resources/lang/kr/errors.php | 84 +
  250. resources/lang/kr/pagination.php | 19 +
  251. resources/lang/kr/passwords.php | 22 +
  252. resources/lang/kr/settings.php | 124 ++
  253. resources/lang/kr/validation.php | 108 +
  254. resources/lang/nl/auth.php | 4 +-
  255. resources/lang/nl/errors.php | 1 +
  256. resources/lang/pl/activities.php | 28 +-
  257. resources/lang/pl/auth.php | 26 +-
  258. resources/lang/pl/common.php | 10 +-
  259. resources/lang/pl/components.php | 13 +-
  260. resources/lang/pl/entities.php | 193 +-
  261. resources/lang/pl/errors.php | 58 +-
  262. resources/lang/pl/passwords.php | 2 +-
  263. resources/lang/pl/settings.php | 54 +-
  264. resources/lang/pt_BR/activities.php | 8 +
  265. resources/lang/pt_BR/common.php | 1 +
  266. resources/lang/pt_BR/entities.php | 36 +
  267. resources/lang/pt_BR/errors.php | 2 +
  268. resources/lang/pt_BR/settings.php | 5 +-
  269. resources/lang/ru/entities.php | 33 +
  270. resources/lang/ru/errors.php | 1 +
  271. resources/lang/sk/errors.php | 1 +
  272. resources/lang/sv/errors.php | 1 +
  273. resources/lang/uk/activities.php | 50 +
  274. resources/lang/uk/auth.php | 67 +
  275. resources/lang/uk/common.php | 60 +
  276. resources/lang/uk/components.php | 34 +
  277. resources/lang/uk/entities.php | 295 +++
  278. resources/lang/uk/errors.php | 83 +
  279. resources/lang/uk/pagination.php | 15 +
  280. resources/lang/uk/passwords.php | 16 +
  281. resources/lang/uk/settings.php | 119 ++
  282. resources/lang/uk/validation.php | 86 +
  283. resources/lang/zh_CN/activities.php | 8 +
  284. resources/lang/zh_CN/common.php | 10 +-
  285. resources/lang/zh_CN/components.php | 3 +-
  286. resources/lang/zh_CN/entities.php | 45 +-
  287. resources/lang/zh_CN/errors.php | 9 +-
  288. resources/lang/zh_CN/settings.php | 3 +-
  289. resources/lang/zh_TW/activities.php | 8 +
  290. resources/lang/zh_TW/common.php | 6 +-
  291. resources/lang/zh_TW/components.php | 3 +-
  292. resources/lang/zh_TW/entities.php | 48 +-
  293. resources/lang/zh_TW/errors.php | 7 +-
  294. resources/lang/zh_TW/settings.php | 5 +-
  295. resources/views/base.blade.php | 8 +-
  296. resources/views/chapters/show.blade.php | 4 +-
  297. resources/views/components/code-editor.blade.php | 4 +-
  298. resources/views/components/page-picker.blade.php | 2 +-
  299. resources/views/errors/404.blade.php | 6 +-
  300. resources/views/pages/export.blade.php | 2 +-
  301. resources/views/pages/revisions.blade.php | 2 +-
  302. resources/views/pages/show.blade.php | 8 +-
  303. resources/views/partials/entity-export-meta.blade.php | 33 +
  304. resources/views/settings/index.blade.php | 4 +-
  305. resources/views/users/edit.blade.php | 3 +-
  306. resources/views/users/profile.blade.php | 33 +-
  307. resources/views/vendor/notifications/email-plain.blade.php | 2 -
  308. tests/ActivityTrackingTest.php | 6 +-
  309. tests/Auth/AuthTest.php | 7 +-
  310. tests/Auth/LdapTest.php | 148 +-
  311. tests/Auth/SocialAuthTest.php | 14 +-
  312. tests/BrowserKitTest.php | 19 +-
  313. tests/CommandsTest.php | 15 +-
  314. tests/Entity/BookShelfTest.php | 22 +-
  315. tests/Entity/CommentSettingTest.php | 2 +-
  316. tests/Entity/CommentTest.php | 6 +-
  317. tests/Entity/EntitySearchTest.php | 16 +-
  318. tests/Entity/EntityTest.php | 15 +-
  319. tests/Entity/ExportTest.php | 15 +-
  320. tests/Entity/MarkdownTest.php | 2 +-
  321. tests/Entity/PageContentTest.php | 22 +-
  322. tests/Entity/PageDraftTest.php | 22 +-
  323. tests/Entity/PageRevisionTest.php | 2 +-
  324. tests/Entity/SortTest.php | 102 +-
  325. tests/Entity/TagTest.php | 12 +-
  326. tests/HelpersTest.php | 19 +
  327. tests/LanguageTest.php | 28 +-
  328. tests/Permissions/RestrictionsTest.php | 46 +-
  329. tests/Permissions/RolesTest.php | 112 +-
  330. tests/PublicActionTest.php | 38 +-
  331. tests/SharedTestHelpers.php | 45 +-
  332. tests/{ => Uploads}/AttachmentTest.php | 49 +-
  333. tests/Uploads/AvatarTest.php | 84 +
  334. tests/{ => Uploads}/ImageTest.php | 139 +-
  335. tests/Uploads/UsesImages.php | 73 +
  336. tests/UserProfileTest.php | 4 +-
  337. tests/test-data/bad.php | Bin 0 -> 560 bytes
  338. tests/test-data/bad.phtml | Bin 0 -> 560 bytes
  339. tests/test-data/bad.phtml.png | Bin 0 -> 158 bytes
  340. version | 2 +-
  341. 338 files changed, 14650 insertions(+), 11073 deletions(-)
  342. create mode 100644 .env.example.complete
  343. rename app/{ => Actions}/Activity.php (93%)
  344. rename app/{Services => Actions}/ActivityService.php (96%)
  345. rename app/{ => Actions}/Comment.php (94%)
  346. rename app/{Repos => Actions}/CommentRepo.php (77%)
  347. rename app/{ => Actions}/Tag.php (85%)
  348. rename app/{Repos => Actions}/TagRepo.php (91%)
  349. rename app/{ => Actions}/View.php (82%)
  350. rename app/{Services => Actions}/ViewService.php (85%)
  351. rename app/{Services => Auth/Access}/EmailConfirmationService.php (93%)
  352. rename app/{Services => Auth/Access}/Ldap.php (80%)
  353. rename app/{Services => Auth/Access}/LdapService.php (82%)
  354. rename app/{Services => Auth/Access}/SocialAuthService.php (92%)
  355. rename app/{ => Auth/Permissions}/EntityPermission.php (84%)
  356. rename app/{ => Auth/Permissions}/JointPermission.php (80%)
  357. rename app/{Services => Auth/Permissions}/PermissionService.php (85%)
  358. rename app/{Repos => Auth/Permissions}/PermissionsRepo.php (95%)
  359. rename app/{ => Auth/Permissions}/RolePermission.php (83%)
  360. rename app/{ => Auth}/Role.php (79%)
  361. rename app/{ => Auth}/SocialAccount.php (78%)
  362. rename app/{ => Auth}/User.php (98%)
  363. rename app/{Repos => Auth}/UserRepo.php (75%)
  364. rename app/{ => Entities}/Book.php (92%)
  365. rename app/{ => Entities}/Bookshelf.php (91%)
  366. rename app/{ => Entities}/Chapter.php (90%)
  367. rename app/{ => Entities}/Entity.php (82%)
  368. create mode 100644 app/Entities/EntityProvider.php
  369. rename app/{Services => Entities}/ExportService.php (94%)
  370. rename app/{ => Entities}/Page.php (92%)
  371. rename app/{ => Entities}/PageRevision.php (94%)
  372. rename app/{ => Entities}/Repos/EntityRepo.php (52%)
  373. create mode 100644 app/Entities/Repos/PageRepo.php
  374. rename app/{Services => Entities}/SearchService.php (81%)
  375. rename app/{ => Entities}/SearchTerm.php (85%)
  376. create mode 100644 app/Exceptions/HttpFetchException.php
  377. create mode 100644 app/Exceptions/UserUpdateException.php
  378. rename app/{Services => }/Facades/Activity.php (85%)
  379. rename app/{Services => }/Facades/Images.php (85%)
  380. rename app/{Services => }/Facades/Setting.php (85%)
  381. rename app/{Services => }/Facades/Views.php (85%)
  382. create mode 100644 app/Notifications/MailNotification.php
  383. create mode 100644 app/Providers/TranslationServiceProvider.php
  384. rename app/{ => Settings}/Setting.php (68%)
  385. rename app/{Services => Settings}/SettingService.php (97%)
  386. create mode 100644 app/Translation/Translator.php
  387. rename app/{ => Uploads}/Attachment.php (84%)
  388. rename app/{Services => Uploads}/AttachmentService.php (93%)
  389. create mode 100644 app/Uploads/HttpFetcher.php
  390. rename app/{ => Uploads}/Image.php (88%)
  391. rename app/{Repos => Uploads}/ImageRepo.php (96%)
  392. rename app/{Services =>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement