hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,351 Commits 268 Branches 107 Tags
2f1a7e2fbb7ba7cb8c4015b56e60f4d79f1796cc
Commit Graph

15351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aina esokia
a72ab5ad7a PHRAS-3310 fix job list 2020-12-16 16:05:19 +03:00
aina esokia
e3f2942250 PHRAS-3306 fix update slug 2020-12-16 15:41:51 +03:00
aina esokia
c62c064c77 PHRAS-3306 2020-12-16 11:44:21 +03:00
Jennifer
06170fe06a Translated using Weblate (German) 
Currently translated at 95.8% (2596 of 2708 strings)
 2020-12-15 20:58:58 +00:00
Jennifer
92203f4ef8 Translated using Weblate (French) 
Currently translated at 95.6% (2591 of 2708 strings)
 2020-12-15 20:58:58 +00:00
Jennifer
1b76232287 Translated using Weblate (English) 
Currently translated at 96.1% (2603 of 2708 strings)
 2020-12-15 20:58:58 +00:00
Nicolas Maillat
c5669806a8 Translated using Weblate (English) 
Currently translated at 96.1% (2603 of 2708 strings)
 2020-12-15 20:42:12 +00:00
Jennifer
c83c452cec Translated using Weblate (German) 
Currently translated at 95.8% (2596 of 2708 strings)
 2020-12-15 19:38:26 +00:00
Jennifer
e1efcb9d46 Translated using Weblate (French) 
Currently translated at 95.6% (2591 of 2708 strings)
 2020-12-15 19:38:25 +00:00
Jennifer
26513907f3 Translated using Weblate (English) 
Currently translated at 96.1% (2603 of 2708 strings)
 2020-12-15 19:38:25 +00:00
Nicolas Maillat
832de865b6 Translated using Weblate (English) 
Currently translated at 96.1% (2603 of 2708 strings)
 2020-12-15 16:23:59 +00:00
Nicolas Maillat
1356c8bb05 Merge pull request #3673 from alchemy-fr/PHRAS-3306-several-fix 
PHRAS-3306 Merge prod - expose - several improvements
 2020-12-15 15:59:33 +01:00
aina esokia
8e89833a82 PHRAS-3306 update 2020-12-15 17:28:10 +03:00
aina esokia
19ec9ecd4f PHRAS-3306 generate locale 2020-12-15 16:56:50 +03:00
aina esokia
1384042d35 merge master 2020-12-15 16:51:44 +03:00
Nicolas Maillat
a30ed87758 Merge pull request #3664 from alchemy-fr/PHRAS-3277-validation-reminder-percent 
PHRAS-3277 merge Change validation-reminder-days: 2 for a percent of time before expiration
 2020-12-15 14:25:57 +01:00
aina esokia
628e728d6a PHRAS-3306 several fix 2020-12-15 16:21:08 +03:00
Nicolas Maillat
4a52de967e Merge branch 'master' into PHRAS-3277-validation-reminder-percent 2020-12-14 17:50:41 +01:00
Nicolas Maillat
80f0f28311 Merge pull request #3672 from alchemy-fr/PHRAS-3262-publication-permission 
PHRAS-3262 merge user right in tab
 2020-12-14 17:50:11 +01:00
aina esokia
4f996477ca PHRAS-3262 right deletion and user search 2020-12-14 17:31:33 +03:00
aina esokia
b56b557b81 reverse group and user in GUI 2020-12-14 10:02:38 +03:00
aina esokia
dc56a702a9 PHRAS-3262 user right in tab 2020-12-11 18:09:27 +03:00
Nicolas Maillat
d5c4271960 update --now example 2020-12-11 15:06:05 +01:00
aina esokia
6dac901bb7 PHRAS-3277 fix displaying old notification reminder data 2020-12-11 16:38:56 +03:00
Nicolas Maillat
7c409b8833 Merge branch 'master' into PHRAS-3277-validation-reminder-percent 2020-12-11 12:23:36 +01:00
Nicolas Maillat
f242f4d444 Merge pull request #3670 from alchemy-fr/PHRAS-3300_slow-delete_MASTER 
PHRAS-3300 Merge refactoring SQL for delete subdefinition when delete record
 2020-12-11 11:57:53 +01:00
Nicolas Maillat
8753497e49 Merge branch 'master' into PHRAS-3277-validation-reminder-percent 2020-12-11 10:16:57 +01:00
Nicolas Maillat
9ec4062e7f Merge branch 'master' into PHRAS-3300_slow-delete_MASTER 2020-12-11 10:16:17 +01:00
Nicolas Maillat
3e8279a856 Merge pull request #3658 from alchemy-fr/PHRAS-3279_api-v3-permalinks-to-es_4.1 
PHRAS-3279 merge API v3 permalinks to es 4.1, add populate_permalinks: true
 2020-12-11 09:38:27 +01:00
jygaulier
9e63fb0195 faster sql (removed sub-select) 2020-12-10 18:46:04 +01:00
Nicolas Maillat
bd10f27316 Merge branch 'master' into PHRAS-3279_api-v3-permalinks-to-es_4.1 2020-12-10 14:28:58 +01:00
aina esokia
957f9712ad PHRAS-3279 2020-12-10 14:24:22 +03:00
Nicolas Maillat
8bd507db9c Merge branch 'master' into PHRAS-3277-validation-reminder-percent 2020-12-10 09:31:18 +01:00
Nicolas Maillat
9e384381bc Merge pull request #3668 from alchemy-fr/PHRAS-3262-expose-user-right-publication 
PHRAS-3262 merge expose-plugin Set user/group right on a publication
 2020-12-10 09:27:03 +01:00
aina esokia
6d18875117 PHRAS-3279 2020-12-09 18:07:11 +03:00
aina esokia
36f2e1a640 PHRAS-3279 2020-12-09 17:13:32 +03:00
aina esokia
c1090021dd fix 2020-12-09 17:00:49 +03:00
aina esokia
413f29a9e1 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3279_api-v3-permalinks-to-es_4.1 2020-12-09 16:58:28 +03:00
aina esokia
f411c715e3 PHRAS-3279 add populate_permalinks key in configuration 2020-12-09 16:48:07 +03:00
aina esokia
a8b16f065f PHRAS-3276 remove patch and move to PHRAS-3278 2020-12-09 14:42:46 +03:00
aina esokia
ab592677b6 PHRAS-3262 add or update user permission 2020-12-08 18:07:12 +03:00
Nicolas Maillat
4c2f682e7b Merge pull request #3667 from alchemy-fr/PHRAS-3295_circle-php7_MASTER 
PHRAS-3295 merge circle-php7 MASTER
 2020-12-08 10:22:41 +01:00
Nicolas Maillat
28573b6e3f Update config.yml 2020-12-08 10:04:14 +01:00
jygaulier
b41c0bcc3e fix : use 7.0.7 as listed by phpenv versions 2020-12-07 20:12:55 +01:00
jygaulier
97156d4397 fix : use phpenv 2020-12-07 20:03:33 +01:00
jygaulier
7ebc1a0fc8 fix : add php version 2020-12-07 19:50:01 +01:00
aina esokia
c3a2a71105 PHRAS-3276 update log_docs action push and validate 2020-12-07 16:09:37 +03:00
aina esokia
cbfb854938 PHRAS-3277 generate locale 2020-12-07 11:59:20 +03:00
aina esokia
ee9999c1d1 merge master 2020-12-07 11:51:54 +03:00
aina esokia
9454a721e2 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3276-invert-push-and-validation-string 2020-12-07 11:46:38 +03:00