1
0
mirror of https://github.com/typemill/typemill.git synced 2025-01-17 13:28:19 +01:00

527 Commits

Author SHA1 Message Date
trendschau
1e6c42c98a Moved proxy detection to top 2020-10-14 07:51:24 +02:00
trendschau
c368c01433 Fixed proxy detection and checked for empty ip settings 2020-10-13 23:01:43 +02:00
trendschau
0a9ce336de updated composer json 2020-10-12 21:07:55 +02:00
trendschau
9906d1a3ae Updated dependencies and deleted media files 2020-10-12 21:00:22 +02:00
trendschau
87d8758921 Merge branch 'develop' of https://github.com/trendschau/typemill into develop 2020-10-12 20:50:56 +02:00
trendschau
fdd001b544 Merge branch 'develop' into master 2020-10-12 20:48:17 +02:00
trendschau
da3c053e0f updated dependencies 2020-10-12 20:48:08 +02:00
trendschau
525f7c3c41 fix download button design 2020-10-12 20:33:10 +02:00
severoiuliano@gmail.com
64b24c41be Version 1.40: latest translations for system.twig 2020-10-08 16:00:37 +02:00
trendschau
0c6b3d9425 Fixed if proxy activated and set back twig base-path to original 2020-10-07 20:54:36 +02:00
trendschau
5a5f44a4f4 added proxy support 2020-10-07 11:37:22 +02:00
trendschau
144871d95d Merge branch 'release139' into develop 2020-10-04 20:17:15 +02:00
trendschau
4948241945 added event to eventbus in vueblox 2020-10-04 20:16:18 +02:00
trendschau
6d9deee6c4 Merge branch 'release139' into develop 2020-10-03 21:51:58 +02:00
trendschau
86dd36fb27 Version 1.4.0 deleted unneccessary files 2020-10-03 21:51:12 +02:00
trendschau
9fded419aa Merge branch 'release139' into develop 2020-10-03 21:42:44 +02:00
trendschau
267b8dada8 Resolved conflict author/languages/fr by deleting : 2020-10-03 21:39:39 +02:00
trendschau
8c977d24b6 Merge branch 'develop' of https://github.com/trendschau/typemill into develop 2020-10-03 21:31:38 +02:00
trendschau
42e005a19c Version 1.40 2020-10-03 21:30:40 +02:00
trendschau
c1c40924db Version 1.4.0 2020-10-03 21:28:20 +02:00
severoiuliano@gmail.com
5f9fb5835b Updated French and German translations 2020-08-07 15:44:21 +02:00
trendschau
f0f971a3e0
Merge pull request #196 from oliviercrouzet/fr_update_tra
French translation update
2020-08-06 07:50:30 +02:00
Olivier Crouzet
0066c7f207 French translation update 2020-08-01 22:15:20 +02:00
severoiuliano@gmail.com
8b06e817d5 i18n: twig file adjustment for roles and rights 2020-07-21 20:56:57 +02:00
severoiuliano@gmail.com
2ecd173d0c i18n: new translations for roles and rights 2020-07-21 20:53:52 +02:00
severoiuliano@gmail.com
6b711536a7 i18n: round brackets not replaced 2020-07-21 20:46:38 +02:00
trendschau
5a0ad33e19 Merge branch 'master' into develop 2020-07-17 11:18:55 +02:00
trendschau
591190410f Version 1.3.8: Roles and rights 2020-07-17 11:17:42 +02:00
trendschau
93afe9f845 Version 1.3.8: Roles and Rights 2020-07-16 12:53:08 +02:00
trendschau
18c3af69c5 Merge branch 'master' into feature138 2020-07-15 10:55:04 +02:00
trendschau
489f1e268e Version 1.3.8: User Rights 2020-07-15 10:53:27 +02:00
trendschau
c17a7caf1a
Merge pull request #182 from aurel-g/master
Display missing requirements properly
2020-07-14 18:50:17 +02:00
aurel-g
6fe3eafd36
Display missing requirements properly
Fix `setup.twig` to display missing requirements errors properly (instead of "Array").
2020-07-14 18:34:19 +02:00
trendschau
296b5ac9da Merge branch 'feature138' into develop 2020-07-11 20:32:32 +02:00
trendschau
c3141ef214 Merge branch 'master' into develop 2020-07-11 20:30:41 +02:00
trendschau
4f80e07810 Version 1.3.8: ACL Integration 2020-07-11 20:28:27 +02:00
trendschau
7d994c2230 Merge branch 'master' into feature138 2020-07-05 09:31:59 +02:00
trendschau
8df40a1902 fixed translations 2020-07-05 09:30:25 +02:00
trendschau
70be33acd2 translation 2020-07-05 09:23:14 +02:00
trendschau
ddd33fb2b7 resolved conflict using iusvar version in system 2020-07-05 09:15:48 +02:00
trendschau
62b3a07d6b Fixed and deleted basic auth for htpasswd 2020-07-05 08:32:04 +02:00
trendschau
74ecf7457e Version 1.3.8: ACL-Implementation 2020-07-04 08:06:18 +02:00
trendschau
2965a068d8 Merge branch 'feature138' into develop 2020-06-25 19:28:11 +02:00
trendschau
51564e5a85 Hotfix 1.3.7.1 2020-06-25 07:51:52 +02:00
trendschau
333c884f73 Hotfix 1.3.7.1 2020-06-25 07:29:39 +02:00
trendschau
543c7869df Hotfix 1.3.7.1 for notice component 2020-06-24 21:52:08 +02:00
severoiuliano@gmail.com
589885dd8a Versione 1.3.8: Translates radio button labels 2020-06-17 16:47:01 +02:00
severoiuliano@gmail.com
0c9010bca9 Version 1.3.8: Updated Italian language 2020-06-17 16:47:00 +02:00
severoiuliano@gmail.com
5ecb1068b4 forgotten translation of the description 2020-06-17 16:47:00 +02:00
severoiuliano@gmail.com
2e583b2e21 correct typo 2020-06-15 11:44:56 +02:00