hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,801 Commits 268 Branches 107 Tags
79d303ec867f6c0d13b4df1b51e7d5738212d2cc
Commit Graph

15801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jygaulier
1182311c71 PHRAS-3153_Doc-to-Swagger 
- add: finished searchraw
- change : using "additionalproperties" for key->values
[ci skip]
 2021-02-05 15:49:47 +01:00
aina esokia
138b699046 PHRAS-3248 duplicate filter under search form 2021-02-05 16:35:25 +03:00
Nicolas Maillat
fd9b577891 Merge pull request #3710 from alchemy-fr/PHRAS-3256-email-language 
PHRAS-3256 merge Email notification - Take the recipient language (locale) in account
 2021-02-03 19:56:19 +01:00
aina esokia
e49e1546a4 fix 2021-02-03 16:12:21 +03:00
aina esokia
cc73d6aeb5 PHRAS-3256 update user locale when changing locale seting 2021-02-03 15:37:32 +03:00
gjacobjn
4bdf64a551 Update .env 2021-02-03 11:16:40 +01:00
gjacobjn
1964f35b8e Update .env 2021-02-03 11:12:56 +01:00
aina esokia
215562ab74 PHRAS-3256 take in account langage in mail 2021-02-03 11:44:42 +03:00
jygaulier
242674c472 PHRAS-3153_Doc-to-Swagger 
- add: searchraw (wip)
[ci skip]
 2021-02-02 18:50:18 +01:00
Nicolas Maillat
72017ed9a4 Update readme [SKIP CI] 2021-02-01 12:42:11 +01:00
Nicolas Maillat
9a693dd212 Merge pull request #3704 from alchemy-fr/PHRAS-3352-workzone-order-filter 
PHRAS-3352 merge Prod- Workzone - keep sort (order) and filter define by the user - date or alpha
 2021-02-01 11:36:47 +01:00
Nicolas Maillat
e0ac81aaca Merge branch 'master' into PHRAS-3352-workzone-order-filter 2021-02-01 11:03:04 +01:00
Nicolas Maillat
85fe984606 Merge pull request #3706 from alchemy-fr/PHRAS-3353-js-versioned-file 
PHRAS-3353 merge Prod - Avoid purging the browser's local cache for JS - versioned file for commons.min.js production.mn.js
 2021-02-01 11:02:44 +01:00
aina esokia
b6afe6a552 fix 2021-02-01 10:47:09 +03:00
aina esokia
b8b3c9947f update readme 2021-02-01 10:43:39 +03:00
aina esokia
b7947c323b Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3353-js-versioned-file 2021-02-01 10:36:47 +03:00
Nicolas Maillat
5d6e713684 Merge branch 'master' into PHRAS-3352-workzone-order-filter 2021-01-29 16:23:13 +01:00
Nicolas Maillat
855b603653 Merge pull request #3702 from alchemy-fr/PHRAS-3350-password-expiration 
PHRAS-3350 Merge Password renewal and creation - link send by email - token TTL - token table of applicationBox
 2021-01-29 15:10:54 +01:00
aina esokia
f70f2c19b3 change this when changing jsfile 2021-01-29 16:51:45 +03:00
aina esokia
af5c1d7686 PHRAS-3353 add version in file 2021-01-29 16:51:07 +03:00
gjacobjn
4d014ab41e Update docker-compose.yml 2021-01-29 14:31:21 +01:00
gjacobjn
77a44c5ab6 Update .env 2021-01-29 14:28:27 +01:00
gjacobjn
a80c57d830 Update entrypoint.sh 2021-01-29 14:26:39 +01:00
gjacobjn
4d38dda9be Update entrypoint.sh 2021-01-29 14:08:23 +01:00
aina esokia
3c34779f3a Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3352-workzone-order-filter 2021-01-29 14:58:42 +03:00
aina esokia
cfe310b835 fix date in mail 2021-01-29 14:57:05 +03:00
aina esokia
9f1fdb5119 Merge branch 'PHRAS-3350-password-expiration' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3350-password-expiration 2021-01-29 14:56:24 +03:00
aina esokia
9dc9fbdc17 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3350-password-expiration 2021-01-29 14:55:10 +03:00
Nicolas Maillat
a462007c7f Translated using Weblate (French) 
Currently translated at 99.4% (2688 of 2704 strings)
 2021-01-29 11:46:07 +00:00
Nicolas Maillat
5537cfd341 Translated using Weblate (English) 
Currently translated at 99.5% (2693 of 2704 strings)
 2021-01-29 11:46:07 +00:00
Jennifer
73a2f0afa7 Translated using Weblate (German) 
Currently translated at 99.4% (2689 of 2704 strings)
 2021-01-29 11:46:01 +00:00
gjacobjn
ce6e345e33 Update entrypoint.sh 2021-01-29 12:37:35 +01:00
aina esokia
fa205b4b6c fix filter 2021-01-29 14:36:33 +03:00
gjacobjn
00927f3a24 Update docker-compose.yml 2021-01-29 12:35:21 +01:00
gjacobjn
97e6086719 Update .env 2021-01-29 12:33:30 +01:00
gjacobjn
82fe4fb33d Update .env 2021-01-29 12:31:36 +01:00
Jennifer
f0278dd587 Translated using Weblate (French) 
Currently translated at 99.4% (2689 of 2704 strings)
 2021-01-28 19:38:19 +00:00
Nicolas Maillat
b819f68d42 Merge branch 'master' into PHRAS-3350-password-expiration 2021-01-28 20:03:44 +01:00
gjacobjn
a836ca23e2 Update entrypoint.sh 2021-01-28 16:10:47 +01:00
gjacobjn
85bd0cddfb Update docker-compose.yml 2021-01-28 16:09:00 +01:00
gjacobjn
1512d491ad Update .env 2021-01-28 16:05:14 +01:00
aina esokia
24b3e50726 PHRAS-3352 save workzone order in user pref 2021-01-28 15:56:42 +03:00
Nicolas Maillat
2c93d3733b Translated using Weblate (French) 
Currently translated at 99.4% (2689 of 2704 strings)
 2021-01-28 07:23:45 +00:00
Nicolas Maillat
994d754326 Translated using Weblate (English) 
Currently translated at 99.5% (2693 of 2704 strings)
 2021-01-28 07:23:42 +00:00
Nicolas Maillat
a36803e4f8 Merge pull request #3701 from alchemy-fr/PHRAS-3288-more-users-existing-feedback 
PHRAS-3288  merge Prod - Workzone - Add more users in existing feedback
 2021-01-28 08:16:46 +01:00
aina esokia
5591de623e fix test unit 2021-01-28 10:14:58 +03:00
aina esokia
55be8c485e fix 2021-01-27 17:02:10 +03:00
aina esokia
504af737bb PHRAS-3350 password renewal ttl 2021-01-27 15:49:48 +03:00
aina esokia
8d2c63e6a2 PHRAS-3288 customize send window for add user 2021-01-27 11:45:28 +03:00
aina esokia
c597513da0 fix alignement 2021-01-26 17:51:59 +03:00