Commit Graph

  • 50852deb37 CS fixes Bob den Otter 2019-07-09 08:39:07 +02:00
  • 10d595b016 Working on Users Bob den Otter 2019-07-09 07:42:39 +02:00
  • 78d1761058 Working on User editing Bob den Otter 2019-07-08 22:38:32 +02:00
  • c52d594823 Working on editing users Bob den Otter 2019-07-02 18:07:06 +02:00
  • 3b629a9186 Fix CSS arrow for multiselect Bob den Otter 2019-07-02 17:12:41 +02:00
  • 7eaec9242d Working on user edit screens Bob den Otter 2019-07-02 09:44:35 +02:00
  • 7581031798 CS Bob den Otter 2019-06-30 13:32:20 +02:00
  • b4b33a0afd Working on pages and controllers for user management. Bob den Otter 2019-06-30 13:27:31 +02:00
  • 968de98775 Merge pull request #509 from bolt/hotfix/translations-in-backend Bob den Otter 2019-07-08 21:24:03 +02:00
  • ed328729f9 Workaround for editing translations in backend Bob den Otter 2019-07-08 21:10:03 +02:00
  • 09d8240505 Merge pull request #499 from sbonardt/feature/structure-layout-backend Bob den Otter 2019-07-04 19:50:02 +02:00
  • 2629f3e83a updates tests Sebastiaan Bonardt 2019-07-04 16:43:32 +02:00
  • dd8b317bf8 fix missed line to delete in file Sebastiaan Bonardt 2019-07-04 14:36:17 +02:00
  • 5d68ad0be8 Merge branch 'feature/structure-layout-backend' of github.com:sbonardt/four into feature/structure-layout-backend Sebastiaan Bonardt 2019-07-04 14:26:40 +02:00
  • 9ebe553b9e put common.js in place for generic backend js Sebastiaan Bonardt 2019-07-04 14:26:17 +02:00
  • b9b1fbca7a Merge branch 'master' into feature/structure-layout-backend Sebastiaan Bonardt 2019-07-03 10:29:38 +02:00
  • c932e532ec fix for slim Sebastiaan Bonardt 2019-07-03 10:15:49 +02:00
  • 815e77d029 Merge pull request #502 from bolt/include-own-dropzone Bob den Otter 2019-07-02 23:08:35 +02:00
  • 91aedf3c07 Working on editing users Bob den Otter 2019-07-02 18:07:06 +02:00
  • 02bf3359a9 Fix CSS arrow for multiselect Bob den Otter 2019-07-02 17:12:41 +02:00
  • 343260bb53 Use Dropzone locally, not from CDN Bob den Otter 2019-07-02 16:14:17 +02:00
  • bc8a9756ef Merge pull request #501 from anketwokings/feature/dropzone Bob den Otter 2019-07-02 15:38:04 +02:00
  • 0e44b629dd Working on user edit screens Bob den Otter 2019-07-02 09:44:35 +02:00
  • 4b80e2db46 Styling dropzone #463 Anke 2019-07-01 18:08:28 +02:00
  • 7231156df1 CS Bob den Otter 2019-06-30 13:32:20 +02:00
  • 4613fd1d17 Working on pages and controllers for user management. Bob den Otter 2019-06-30 13:27:31 +02:00
  • 573377de65 Merge pull request #500 from bolt/add-menu-pages Bob den Otter 2019-06-30 07:14:51 +02:00
  • 4963fd8f35 Adding simple "menu" pages, for mobile Bob den Otter 2019-06-29 16:49:29 +02:00
  • 6bb115f916 Merge pull request #498 from anketwokings/feature/hidden-danger Bob den Otter 2019-06-29 13:12:36 +02:00
  • d725f50557 Merge pull request #495 from anketwokings/weatherwidget Bob den Otter 2019-06-29 13:07:19 +02:00
  • 5e989b17d5 redo of layout backend, making it responsive and mobile first. MVP for now Sebastiaan Bonardt 2019-06-28 16:16:32 +02:00
  • 3acadba5ee Adds hidden-danger class - #493 Anke 2019-06-28 14:39:59 +02:00
  • 557425bf12 Herp, Derp, multibyte.. Bob den Otter 2019-06-28 13:17:48 +02:00
  • bcd3683252 Slightly different way to handle error from wttr.in response Bob den Otter 2019-06-28 13:05:33 +02:00
  • 87c363e816 Cast output to string, in case widget fails. Bob den Otter 2019-06-28 13:03:46 +02:00
  • a93b8ca3ce Weather widget should not break Bolt when giving an error Anke 2019-06-28 11:01:56 +02:00
  • 1ded9ceb14 Merge pull request #494 from bolt/tweaking-css Bob den Otter 2019-06-26 20:33:11 +02:00
  • b66462ba9e Minor changes Bob den Otter 2019-06-26 18:09:54 +02:00
  • f92434a2a4 Merge pull request #491 from anketwokings/master Bob den Otter 2019-06-25 17:20:21 +02:00
  • e94aa6a49d update test + put disabled defaut button in kitchensink Anke 2019-06-25 16:40:23 +02:00
  • 4ee722f77e rewrite save-button to new macro (failed test earlier) Anke 2019-06-25 16:12:55 +02:00
  • 768a117c7c removing comment Anke 2019-06-25 15:38:53 +02:00
  • ac8df78d7e Better disabled buttons, improved defaults in button macro Anke 2019-06-25 15:36:46 +02:00
  • e328e4ef2d Merge branch 'master' of https://github.com/bolt/four Anke 2019-06-25 11:06:53 +02:00
  • 6f7ebfc0fa Merge pull request #490 from bolt/clean-up-scss Bob den Otter 2019-06-25 10:49:14 +02:00
  • 4291f7bd45 Remove redundant label Bob den Otter 2019-06-25 09:21:52 +02:00
  • 021fbf71f2 Updating Translations Bob den Otter 2019-06-25 09:17:08 +02:00
  • 1aef92a318 Tweak, tweak Bob den Otter 2019-06-24 22:03:38 +02:00
  • 7636c32d4a More cleanup Bob den Otter 2019-06-24 21:08:40 +02:00
  • d9dd6f2bb5 Tweak Bob den Otter 2019-06-24 21:02:52 +02:00
  • b1509cd01f Clean up SCSS structure Bob den Otter 2019-06-24 20:39:48 +02:00
  • 4169050761 Merge pull request #489 from sbonardt/master Bob den Otter 2019-06-24 16:40:57 +02:00
  • 6490c25b7d Extra info about the following install steps Sebastiaan Bonardt 2019-06-24 15:12:57 +02:00
  • 2607a7b8be Readme refinements Sebastiaan Bonardt 2019-06-24 15:06:26 +02:00
  • 170bf8896a Merge pull request #487 from bolt/hotfix/bumping-npm-deps Bob den Otter 2019-06-22 17:18:14 +02:00
  • 85b30b858b Bumping NPM dependencies Bob den Otter 2019-06-22 16:55:36 +02:00
  • 5fbfbfc0c8 Merge pull request #485 from bolt/hotfix/multi-values-for-select Bob den Otter 2019-06-22 16:48:03 +02:00
  • 89b281cd46 Make sure multiple selects keep all values Bob den Otter 2019-06-22 15:19:30 +02:00
  • 1c295f83e3 Merge pull request #486 from bolt/hotfix/alternative-fix-for-API-issue Bob den Otter 2019-06-22 16:40:04 +02:00
  • 4935b6065a Fix test Bob den Otter 2019-06-22 16:29:29 +02:00
  • c2804d38d1 Don't call Non-static method statically Bob den Otter 2019-06-22 15:56:40 +02:00
  • 59e514f774 Merge pull request #484 from bolt/feature/add-sanitiser Bob den Otter 2019-06-22 14:46:50 +02:00
  • 216f67ac3f Update ContentFixtures.php Bob den Otter 2019-06-22 14:23:46 +02:00
  • e703f96fc9 Adding some e2e-tests for Sanitiser Bob den Otter 2019-06-22 14:19:25 +02:00
  • c29fc421d9 Merge pull request #483 from bolt/hotfix/no-easy-log-handler Bob den Otter 2019-06-22 12:55:57 +02:00
  • a899517094 remove unneeded dumps Bob den Otter 2019-06-22 12:48:40 +02:00
  • 28d7a794a0 Add HTML Sanitiser for fields Bob den Otter 2019-06-22 12:42:31 +02:00
  • 1fe95466bf Don't include easy-log-handler Bob den Otter 2019-06-21 15:42:47 +02:00
  • dd30dea099 Merge pull request #480 from bolt/hotfix/news-error Bob den Otter 2019-06-21 15:35:12 +02:00
  • 35353fe166 Merge pull request #482 from bolt/hotfix/correct-first-element Bob den Otter 2019-06-21 15:34:54 +02:00
  • 98dc5b3cb0 Correctly get first element from a select element. Bob den Otter 2019-06-21 15:07:20 +02:00
  • e30e14c22b Rewrite button macros Anke 2019-06-21 14:30:02 +02:00
  • f2264eb46b CS fix Bob den Otter 2019-06-21 08:55:58 +02:00
  • 8ea1d4d55d Return error when News couldn't be fetched Bob den Otter 2019-06-21 08:35:37 +02:00
  • 0a8a40c9aa Merge pull request #479 from bolt/hotfix/optimize-assets Bob den Otter 2019-06-19 16:46:02 +02:00
  • 227ae6d57c Update _fonts.scss Bob den Otter 2019-06-19 16:30:53 +02:00
  • 4e7f8a3b9d Optimize assets Bob den Otter 2019-06-19 16:30:02 +02:00
  • b6bcd9d524 Merge pull request #477 from bolt/hotfix/simpler-weather Bob den Otter 2019-06-19 14:54:57 +02:00
  • 5c721169da Herp-a-derp, whitespace fix. Bob den Otter 2019-06-19 13:23:34 +02:00
  • 73c56c5399 Update HtmlInjector.php Bob den Otter 2019-06-19 11:44:36 +02:00
  • 997c6da9b8 Allow widgets to return null if they fail, and the results shouldn't be cached. Bob den Otter 2019-06-19 10:11:55 +02:00
  • 38e791db1e tidy Bob den Otter 2019-06-18 17:29:35 +02:00
  • e652daad44 Still cache it, though Bob den Otter 2019-06-18 17:28:00 +02:00
  • 76cf85ccdb Use wttr.in for weather instead Bob den Otter 2019-06-18 17:26:04 +02:00
  • 09c7c0170d Merge pull request #478 from bolt/hotfix/fix-npm-bitrot Bob den Otter 2019-06-19 11:02:17 +02:00
  • b2b375fe22 Add package-lock.json to repo Bob den Otter 2019-06-19 10:44:51 +02:00
  • fc89b0707d Update package.json Bob den Otter 2019-06-19 10:39:34 +02:00
  • 59440c8c6c Remove 'static' from 'public function getType()' Bob den Otter 2019-06-17 15:05:23 +02:00
  • 144515ed99 Merge pull request #469 from bolt/hotfix/query-andwhere Bob den Otter 2019-06-13 19:15:10 +02:00
  • 2594e50138 Merge pull request #468 from bolt/hotfix/remove-font Bob den Otter 2019-06-13 19:15:00 +02:00
  • 5787b3192d Merge pull request #462 from bolt/fileeditor-and-browser-work Bob den Otter 2019-06-13 19:14:10 +02:00
  • 0dd8f66cc6 Revert unneeded commit Bob den Otter 2019-06-13 15:54:30 +02:00
  • 47f99fbe75 Use 'andWhere' instead of 'where' Bob den Otter 2019-06-13 15:52:57 +02:00
  • b926385b17 Ninja-edit remove unneeded remote font Bob den Otter 2019-06-12 17:35:44 +02:00
  • 6b68b47f80 Ninja-edit remove unneeded remote font Bob den Otter 2019-06-13 15:52:08 +02:00
  • 8b99f73a4a Finetunen Bob den Otter 2019-06-12 13:17:08 +02:00
  • 3d959707e9 Working on File editor and Filebrowser Bob den Otter 2019-06-12 12:56:09 +02:00
  • 3acee8ea8b Merge pull request #471 from bolt/hotfix/temporarily-lock-sy Bob den Otter 2019-06-13 17:34:54 +02:00
  • e28064b574 Exclude api-platform 2.4.4, see #470 Bob den Otter 2019-06-13 17:13:40 +02:00
  • 99deebb1dc Merge pull request #461 from bolt/working-on-file-editors Bob den Otter 2019-06-10 15:01:48 +02:00