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

15668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
5fa01a0438 Merge pull request #3716 from alchemy-fr/PHRAS-3341-title-bar 
PHRAS-3341 Merge Prod - Detailled view - title bar - find an other place for base/collection
 2021-02-10 17:09:49 +01:00
aina esokia
78b0f61843 change text and icon size 2021-02-10 18:00:20 +03:00
Moctar
2e192980ab Create custom network for phraseanet using env parameter PHRASEANET_SUBNET_IPS 2021-02-10 15:58:17 +01:00
aina esokia
81aa75c600 add space 2021-02-10 17:26:46 +03:00
aina esokia
debeb01b41 fix interligne 2021-02-10 17:22:26 +03:00
aina esokia
e48186e98e different fix in screen 2021-02-10 16:09:06 +03:00
aina esokia
b069737507 PHRAS-3341 title bar base/collection other place 2021-02-09 18:14:07 +03:00
Nicolas Maillat
e5da00e8c6 Merge branch 'master' into PHRAS-3351-Add-env-variables-to-allow-setup-editing 2021-02-09 13:19:11 +01:00
Nicolas Maillat
add26e5e7c Merge pull request #3715 from alchemy-fr/PHRAS-3356-fix-detail-view 
PHRAS-3356 merge Prod - detailed view - related story - broken when no right to Access report
 2021-02-09 13:17:35 +01:00
aina esokia
63e6bd0307 PHRAS-3356 fix detail view when no right to report 2021-02-09 11:19:26 +03:00
jygaulier
bc1b9f96cc PHRAS-3153_Doc-to-Swagger 
- add: json examples for post/patch record
[ci skip]
 2021-02-08 21:18:17 +01:00
Nicolas Maillat
996962cdfc Merge pull request #3712 from alchemy-fr/PHRAS-3357_bump-php-in-composer 
PHRAS-3357 merge bump php in composer
 2021-02-08 19:57:40 +01:00
Nicolas Maillat
3d1aa0842c Merge branch 'master' into PHRAS-3357_bump-php-in-composer 2021-02-08 19:01:40 +01:00
aina esokia
487d2d467f PHRAS-3358 rename patch 4.1.3 2021-02-08 17:17:50 +03:00
Nicolas Maillat
e177502035 Merge pull request #3713 from alchemy-fr/PHRAS-3126-advanced-search-blue-coloration 
PHRAS-3126 Merge prod - search bar - background blue coloration is missing when search filter is active.
 2021-02-08 10:42:21 +01:00
aina esokia
86774ecd5f PHRAS-3126 fix advanced search coloration 2021-02-08 11:41:32 +03:00
jygaulier
83ccec0bb4 Merge branch 'master' into PHRAS-3357_bump-php-in-composer 2021-02-05 17:30:11 +01:00
jygaulier
6f2c6e0212 stay in php 7.0.x 2021-02-05 17:29:13 +01:00
Nicolas Maillat
86fda70bfd Merge pull request #3711 from alchemy-fr/PHRAS-3248-facet-filter-under-search 
PHRAS-3248 Merge Prod - Add selected filters (facets) under search form in search zone
 2021-02-05 17:17:54 +01:00
jygaulier
107dfed1e1 PHRAS-3357_bump-php-in-composer 
bump to 7.0.x to 7.2.x
 2021-02-05 17:01:23 +01:00
aina esokia
5b919bd79e fix search form place 2021-02-05 18:04:17 +03:00
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