Commit Graph

534 Commits

Author SHA1 Message Date
Jelle Kok 0fbc337d4a Merge remote-tracking branch 'refs/remotes/joomla-extensions/master' into joomla-extensions/tests 2017-11-06 14:54:35 +01:00
Astrid 84df598015 makeSameAliasPossibleForDifferentLanguages (#373) 2017-11-06 12:56:26 +01:00
Astrid 08e6da7006 addJoroboMapTaskToRoboFile (#374) 2017-11-06 12:55:24 +01:00
Astrid ffc012d56a changedlanguagestringssothatimagefloatismoreconcrete (#376) 2017-11-06 12:54:06 +01:00
Astrid 9bc1752ca5 First imageignores image float setting366 (#378)
* usethesameclassforfloatingtheimageslikecomcontent

* addchangetosecondimage
2017-11-06 12:52:45 +01:00
Astrid c9d4f57cea mapping of new media files was not correct (#372) 2017-11-06 12:52:05 +01:00
Astrid bb7343450b
Merge pull request #370 from joomla-extensions/zero-24-patch-1
Delete jed_update.xml
2017-11-03 21:46:55 +01:00
Astrid d0ff882375
Merge pull request #349 from infograf768/weblinks_assoc
Implementing full associations for single weblink
2017-11-03 21:46:26 +01:00
Astrid 50ee6f5a34
Merge pull request #317 from zero-24/custom_fields
[RFC] [3.7] Add basic custom fields support
2017-11-03 21:45:33 +01:00
zero-24 c9cae3de4e Delete jed_update.xml 2017-10-22 12:18:58 +02:00
Astrid e69347e255 Update config.xml
deleted merge conflict hints.
2017-09-16 18:36:25 +02:00
zero-24 8b9ab398a9
Merge branch 'custom_fields' of github.com:/zero-24/weblinks into custom_fields 2017-09-13 19:04:44 +02:00
zero-24 6243927ffd
merge conflict 2017-09-13 19:03:30 +02:00
Jelle Kok 4dab040a95 update composer 2017-09-01 01:31:01 +02:00
zero-24 e8a9d563af thanks @quy 2017-09-01 01:30:47 +02:00
zero-24 ef9e8f4198 thanks @quy 2017-09-01 01:29:47 +02:00
zero-24 84a5009952 thanks @quy 2017-09-01 01:29:16 +02:00
zero-24 1ad63abd54 thanks @quy 2017-09-01 01:28:39 +02:00
Jelle Kok 481140267c fluxbox aleady installed 2017-09-01 01:19:20 +02:00
Jelle Kok 6d25f96a5c remove sudo 2017-09-01 01:14:19 +02:00
Jelle Kok f1c7b7745a update tests 2017-09-01 01:11:19 +02:00
Brian Teeman 2ebe811b60 xml code-style (#363)
* xml code-style

* fixes

* oops
2017-08-31 19:56:12 +02:00
Jelle Kok 78b8e47eaf try firefox again 2017-08-24 02:47:07 +02:00
Jelle Kok f995ed76f9 add trusty 2017-08-24 02:27:57 +02:00
Jelle Kok 076d4a9b43 Add chrome 2017-08-24 02:01:56 +02:00
Jelle Kok 6a78ebbc8c fix copy .htaccess 2017-08-24 01:41:34 +02:00
Jelle Kok e6b607a998 add build 2017-08-24 01:13:17 +02:00
Jelle Kok fe33842e2f set chrome 2017-08-23 18:24:49 +02:00
Jelle Kok 7f74e57498 fix codestyle 2017-08-23 18:11:34 +02:00
Jelle Kok 1569470697 use new container 2017-08-23 18:03:48 +02:00
Jelle Kok 26a3f69317 Update new tests support (WIP) 2017-08-18 16:05:08 +02:00
Brian Teeman 84a98f9718 typo (#358)
i made a pr to the cms as well
2017-08-16 22:23:50 +02:00
Michael Babker 06bc161692 Merge pull request #354 from joomla-extensions/use-downloads-site
Serve updates through the downloads site
2017-07-23 13:02:40 -05:00
Michael Babker 3cd419ff67 Serve updates through the downloads site 2017-06-14 21:55:03 -05:00
Jean-Marie Simonet 725464800f Correcting weblink frontend model to adapt to the new display 2017-06-10 08:33:20 +02:00
zero-24 58fa74a1a2 Update modal.php 2017-05-22 14:14:50 +02:00
zero-24 7e9269d993 Update weblink.php 2017-05-22 14:13:49 +02:00
infograf768 b6e084a828 deploy 2017-05-22 12:04:38 +02:00
infograf768 da554cbac7 Merge pull request #5 from zero-24/weblinks_assoc
fix some smal things
2017-05-22 12:01:44 +02:00
zero-24 9b30cedb4d fix some smal things 2017-05-21 18:59:44 +02:00
Jean-Marie Simonet db0bfa95b9 small corrections 2017-05-20 08:28:21 +02:00
Jean-Marie Simonet 4f33935200 correcting date 2017-05-17 09:08:43 +02:00
Jean-Marie Simonet 3151bf9c8f Minifying js and adding xtd-editors web link 2017-05-17 09:06:21 +02:00
Jean-Marie Simonet 75684b9918 Changing comment 2017-05-16 17:55:36 +02:00
Jean-Marie Simonet 9b6e02a384 adding media in manifest 2017-05-16 17:50:43 +02:00
Jean-Marie Simonet 99f239c8a5 missing change 2017-05-16 08:42:34 +02:00
Jean-Marie Simonet 3389bf4902 IMplementing full associations 2017-05-16 08:03:22 +02:00
Jelle Kok 12498eb311 Update composer (#347) 2017-05-12 20:42:13 +02:00
zero-24 b68ab0f2bd Disable the buttons and just allow editor none for not authenticated users (#340) 2017-04-23 12:21:33 +02:00
Astrid 60557d4f88 Version number (#342)
* ->env(['env'])

* versionnumberJorobe
2017-04-22 13:54:00 +02:00