Commit Graph

395 Commits

Author SHA1 Message Date
Jarek Jakubowski cc21311194 removed commented code 2019-01-24 11:48:17 +01:00
Jarek Jakubowski 9960bd06ae removed commented code 2019-01-24 11:43:39 +01:00
Jarek Jakubowski 6fd15933c3 merge master 2019-01-24 11:22:09 +01:00
Jarek Jakubowski 947f8720f6 Merge pull request #292 from bolt/fix/admin-menu
Fix Admin menu links
2019-01-24 09:44:49 +01:00
Jarek Jakubowski b78621e90f yet another setcontent fix 2019-01-24 09:02:31 +01:00
Jarek Jakubowski ec8cc68fcd Fix Admin menu links 2019-01-23 20:58:23 +01:00
Jarek Jakubowski 35b934ea25 cs fix 2019-01-23 19:21:25 +01:00
Jarek Jakubowski 7d3d8895c7 make db table prefix configurable 2019-01-23 19:18:06 +01:00
Jarek Jakubowski d6ba244020 fix conflict 2019-01-23 18:25:01 +01:00
Jarek Jakubowski 328be83e2a TranslationWalker now works globally 2019-01-23 18:17:22 +01:00
Jarek Jakubowski 56b9c4de69 working on translatable, still a lot of queries 2019-01-23 09:41:56 +01:00
Xiao Hu Tai 8a43d482fc Set correct alignment for phpdoc 2019-01-22 18:31:40 +01:00
Xiao Hu Tai 5b67d8ce0b Add type hints to phpdoc 2019-01-22 18:06:20 +01:00
Xiao Hu Tai de5e73d8f0 Add @param phpdoc to getContentForTwig 2019-01-22 14:43:33 +01:00
Xiao Hu Tai 9d602d7d87 Simplify getContentForTwig 2019-01-22 14:04:50 +01:00
Xiao Hu Tai 1ef103fb14 Fix query
See 1624cdc
2019-01-22 14:04:50 +01:00
Xiao Hu Tai e828ffb6e2 Return value can be Content|QueryResultset|null 2019-01-22 14:04:50 +01:00
Jarek Jakubowski cfeff6def1 trying to fix admin menu 2019-01-22 13:33:57 +01:00
Jarek Jakubowski dab421cbc2 remove localizedfield from twig 2019-01-22 11:54:54 +01:00
Jarek Jakubowski b8a4fab3ce fix typo in method name 2019-01-22 10:22:52 +01:00
Jarek Jakubowski a83a7a2164 logical fix 2019-01-22 10:18:36 +01:00
Jarek Jakubowski 354ba90afa merge master and fix style 2019-01-22 09:59:26 +01:00
Bob den Otter 5a5e140f86 Merge pull request #284 from bolt/hotfix/no-double-Markup
Fix: No double `Markup` required for text-like fields
2019-01-22 09:35:48 +01:00
Bob den Otter 61e5ad026a Add @todo 2019-01-22 09:19:35 +01:00
Jarek Jakubowski 61d480c7da fix mapping 2019-01-22 00:17:38 +01:00
Jarek Jakubowski bc8ddfacc0 fix conflict 2019-01-21 22:55:32 +01:00
Jarek Jakubowski 88f7e91bf4 Implement Translatable Doctrine Extension 2019-01-21 22:51:03 +01:00
Bob den Otter f19e8c733d No double Markup required for text-like fields 2019-01-21 21:38:03 +01:00
Bob den Otter bc729fae77 Don't break if Contenttype has no image 2019-01-21 19:25:32 +01:00
Bob den Otter 00d1268b99 Merge pull request #278 from bolt/hotfix/flashes-and-saving-without-taxo
[hotfix] Don't break when trying to save record without Taxonomies
2019-01-21 14:49:07 +01:00
Jarek Jakubowski 44dcfc120f Merge pull request #270 from bolt/fix/taxonomy-tests
Fix Taxonomy tests
2019-01-21 12:12:43 +01:00
Jarek Jakubowski d433faef37 Undo remove default taxonomy options, add DbAwareTestCase, fix tests 2019-01-21 09:28:42 +01:00
Bob den Otter 985a49451c Minor fixes 2019-01-20 15:28:14 +01:00
Jarek Jakubowski 2f5101e5e7 PHPStan upgrade 2019-01-18 20:52:03 +01:00
Jarek Jakubowski e84668f589 Config refactor 2019-01-18 12:17:59 +01:00
Jarek Jakubowski 85968a8d88 Config refactor 2019-01-17 22:02:57 +01:00
Bob den Otter 7595b1ea33 Merge pull request #269 from bolt/cache-config-parser
Cache config files
2019-01-17 19:01:43 +01:00
Jarek Jakubowski 83ae8e93f3 merge master 2019-01-17 16:15:23 +01:00
Jarek Jakubowski f3a1d1907d Merge pull request #268 from bolt/feature/content-api-endpoint
Content API Endpoint and Behat tests
2019-01-17 15:48:45 +01:00
Jarek Jakubowski 7e7126064e Fix Taxonomy tests 2019-01-17 15:47:11 +01:00
Bob den Otter 6eb7a38b4a Inject CacheInterface 2019-01-17 14:48:56 +01:00
Bob den Otter 4124b993fe Set cache files at same time 2019-01-17 14:22:34 +01:00
Bob den Otter 731ae11f96 Add @todo 2019-01-17 14:16:18 +01:00
Bob den Otter 6936c92b21 Don't use __DIR__ 2019-01-17 14:10:36 +01:00
Bob den Otter 822024748f Update Config.php 2019-01-17 11:59:34 +01:00
Bob den Otter 739fef5915 Cache config files 2019-01-16 22:38:50 +01:00
Jarek Jakubowski 65169ae667 magic content fixes 2019-01-16 15:34:08 +01:00
Jarek Jakubowski b900a2725c cs fixes 2019-01-16 13:59:58 +01:00
Jarek Jakubowski 580c0b288e Content API Endpoint ad Behat tests 2019-01-16 12:58:40 +01:00
Bob den Otter e306459236 Requested change to Taxonomy.php 2019-01-16 10:35:01 +01:00