hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 06:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,257 Commits 268 Branches 107 Tags
e591125e83cbbf09dd6d2dd73a19cb3ee758e40c
Commit Graph

16257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aynsix
8ffa2f7476 generate translation 2021-07-26 10:54:54 +03:00
aynsix
660ad5c9b4 can set value to null 2021-07-23 16:51:09 +03:00
aynsix
63fc2bfd60 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3474-mapping-client-annotation 2021-07-23 14:59:17 +03:00
aynsix
90f3e2a39e add datetime picker to expose dialog 2021-07-23 14:58:07 +03:00
jygaulier
36b93a71c1 Merge pull request #3830 from alchemy-fr/PHRAS-3489_order-from-parade-late-deadline 
PHRAS-3489_order-from-parade-late-deadline
 2021-07-22 18:14:58 +02:00
jygaulier
e5d55326a3 PHRAS-3489_order-from-parade-late-deadline 
fix : align createtime and deadtime by using the same method (store in mysql converted to utc)
 2021-07-22 17:41:16 +02:00
aynsix
c23d54901e fix slug availability 2021-07-22 18:08:53 +03:00
aynsix
12ca54dcd3 fix strpos warning 2021-07-22 15:22:21 +03:00
aynsix
5c4343b445 Merge branch 'PHRAS-3474-mapping-client-annotation' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3474-mapping-client-annotation 2021-07-22 11:01:45 +03:00
aynsix
ca8e145b7b date format 2021-07-22 11:00:52 +03:00
Nicolas Maillat
fadd8e4069 Merge branch 'master' into PHRAS-3474-mapping-client-annotation 2021-07-21 21:14:38 +02:00
jygaulier
3e8d5aaf3c PHRAS-3442_optimize_notifications 
fix missing "on" clause on sql
 2021-07-21 20:59:38 +02:00
aynsix
b3f2692d7a change date format 2021-07-21 16:45:36 +03:00
aynsix
bdb15aab13 add thumbnail and preview if not have mapping 2021-07-19 18:00:50 +03:00
aynsix
62fa8a506c check slug availability 2021-07-19 17:52:32 +03:00
aynsix
0069386e4a add more setting field 2021-07-19 15:37:37 +03:00
aynsix
4e2d2b965f PHRAS-3488 2021-07-19 14:50:34 +03:00
aynsix
628eb6199c fix duplicate mapping 2021-07-16 15:29:31 +03:00
aynsix
9d0f67c998 add checkbox vtt ans geoloc 
[SKIP CI]
 2021-07-15 17:37:19 +03:00
aynsix
089c6cc5f6 add locale for subdef name 2021-07-15 10:09:23 +03:00
aynsix
fd760b0dc3 Merge branch 'PHRAS-3474-mapping-client-annotation' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3474-mapping-client-annotation 2021-07-14 17:39:57 +03:00
aynsix
9029da320a PHRAS-3475 subdef mapping 2021-07-14 17:38:15 +03:00
Nicolas Maillat
95f8988919 Merge branch 'master' into PHRAS-3474-mapping-client-annotation 2021-07-13 20:19:45 +02:00
Nicolas Maillat
8c0caf7266 Merge pull request #3824 from alchemy-fr/PHRAS-3476_subdefs-corrupted 
PHRAS-3476 merge subdefs corrupted
 2021-07-13 17:46:01 +02:00
jygaulier
fdc938c988 fix : no writemeta on doc while building subdef 
add traces
 2021-07-12 21:32:12 +02:00
jygaulier
ab0da6cff2 PHRAS-3476_subdefs-corrupted 
fix : removed globals[app] for circleci
 2021-07-12 21:29:26 +02:00
jygaulier
f831bb282d PHRAS-3476_subdefs-corrupted 
fix : q-message "writemeta/document" is now sent after all synchronous exiftools.
added lot of traces, to be removed asap
 2021-07-12 21:29:26 +02:00
aynsix
15514d45f1 Merge branch 'PHRAS-3474-mapping-client-annotation' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3474-mapping-client-annotation 2021-07-12 11:37:22 +03:00
aynsix
b3aadb83ab order field mapping in expose 2021-07-12 11:36:57 +03:00
Nicolas Maillat
40d3668e20 Merge branch 'master' into PHRAS-3474-mapping-client-annotation 2021-07-09 20:53:34 +02:00
aynsix
04cb52f913 PHRAS-3474 save mapping in expose profile 2021-07-09 15:40:30 +03:00
Nicolas Maillat
36abe2da0c PHRAS-3485 comment squid env var 2021-07-09 09:53:06 +02:00
Nicolas Maillat
420908f92f Merge pull request #3825 from alchemy-fr/PHRAS-3109_gitlog_message 
PHRAS-3109 merge  gitlog in "About Phraseanet"
 2021-07-09 00:14:35 +02:00
Nicolas Maillat
f9fea69ef2 Merge branch 'master' into PHRAS-3109_gitlog_message 2021-07-08 23:44:49 +02:00
Nicolas Maillat
4bdf31158d Merge pull request #3826 from alchemy-fr/PHRAS-3484_docker_tag_mariadb_rabbitmq 
PHRAS-3484 set rabbitmq version
 2021-07-08 23:44:35 +02:00
nmaillat
795a0e1389 PHRAS-3484 fix rabbitmq version 2021-07-08 23:20:45 +02:00
nmaillat
d137826db2 PHRAS-3109 Exclude from git www/ gitlog.txt file if generated 
[SKIP CI]
 2021-07-08 12:49:56 +02:00
Nicolas Maillat
cd09791dc4 Merge pull request #3822 from alchemy-fr/PHRAS-3479_trace-crash-on-usec0 
PHRAS-3479 merge fix trace crash on usec 0
 2021-06-30 18:50:50 +02:00
jygaulier
2647580d5f PHRAS-3479_trace-crash-on-usec0 
fix : "trace" do not report usec anymore
 2021-06-30 17:43:36 +02:00
Nicolas Maillat
1a6dae14a7 Merge pull request #3821 from alchemy-fr/PHRAS-3416_Phraseanet_localization_weblate 
PHRAS-3416 merge phraseanet localization weblate PHRAS-3471 PHRAS-3466
 2021-06-30 15:59:13 +02:00
Hosted Weblate
ad4258462c Merge branch 'origin/master' into Weblate. 2021-06-30 15:31:24 +02:00
Nicolas Maillat
dde76c2583 Merge pull request #3816 from alchemy-fr/PHRAS-3461_clean-notifications 
PHRAS-3461 merge clean notifications
 2021-06-30 15:31:19 +02:00
Nicolas Maillat
0aa830f0d5 Translated using Weblate (French) 
Currently translated at 99.0% (2716 of 2741 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2021-06-30 15:30:44 +02:00
Nicolas Maillat
d159461d9e Translated using Weblate (English) 
Currently translated at 99.0% (2714 of 2741 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/en/
 2021-06-30 15:30:43 +02:00
Nicolas Maillat
f27f9e6f06 Merge branch 'master' into PHRAS-3461_clean-notifications 2021-06-30 15:10:47 +02:00
Nicolas Maillat
9001fd08bd Merge pull request #3818 from alchemy-fr/PHRAS-3438-proxy-expose-service 
PHRAS-3438 merge expose using http proxy when define
 2021-06-30 15:08:36 +02:00
Nicolas Maillat
bbe964ff9a Merge branch 'master' into PHRAS-3438-proxy-expose-service 2021-06-30 14:36:56 +02:00
Nicolas Maillat
e21cb5e96f Merge pull request #3820 from alchemy-fr/PHRAS-3463_workers_supervisor 
PHRAS-3463 Merge launch Phraseanet's workers with supervisor (option)
 2021-06-30 14:36:44 +02:00
nmaillat
0c56075641 change path for pid file 2021-06-30 14:01:29 +02:00
nmaillat
708df8142d fix home for app in supervisor job conf file 2021-06-30 13:24:07 +02:00