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

12658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aina-esokia
b1a4dda522 update alchemy/embed-bundle to 0.3.8 2019-01-25 15:37:11 +04:00
aina-esokia
c1dac08ded Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2375-port41-preview-pdf-on-pdfjs 2019-01-25 15:13:00 +04:00
Nicolas Maillat
081c90852e Merge pull request #2906 from alchemy-fr/PHRAS-2410_disable_pear_php_in_4.1 
PHRAS-2410 disable pear.php.net in master
 2019-01-25 11:29:06 +01:00
Nicolas Maillat
9e7e9fe284 PHRAS-2410 disable pear.php.net in master 2019-01-25 10:58:20 +01:00
Nicolas Maillat
5273f7a3bf Merge pull request #2900 from aynsix/PHRAS-2394-generate-subdef-for-mxf 
PHRAS-2394 Generate Subdef (subview) for video MXF container
 2019-01-24 01:22:25 +01:00
Nicolas Maillat
e24ae6be2b Merge branch 'master' into PHRAS-2394-generate-subdef-for-mxf 2019-01-24 01:15:29 +01:00
Nicolas Maillat
2a5ba97a32 Merge pull request #2895 from aynsix/PHRAS-2384-api-accept-auth-token-in-header 
PHRAS-2384 Securing the API - API accept auth token only in header.
 2019-01-24 00:39:01 +01:00
aina-esokia
8799bfb99a update alchemy/mediavorus 2019-01-22 16:36:48 +04:00
aina-esokia
9976ebee6f update composer.lock 2019-01-17 19:02:00 +04:00
aina-esokia
1e851113c8 update alchemy/oauth2php in 4.1 2019-01-17 11:02:22 +04:00
aina-esokia
8740ef9970 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2384-api-accept-auth-token-in-header 2019-01-16 12:27:46 +04:00
aina-esokia
cb490bc83d use const on call 2019-01-16 12:27:24 +04:00
Nicolas Maillat
c51b492fa9 Merge pull request #2894 from filipx/PHRAS-2385_port_local_manu_refacto 
PHRAS-2385_port_local_manu_refacto
 2019-01-15 14:41:54 +01:00
aina-esokia
fd495e7966 update configuration.sample.yml for api_token_header config 2019-01-15 17:06:34 +04:00
aina-esokia
26a25532f5 taken account config to retrieve token in header or in url 2019-01-15 15:54:37 +04:00
filipx
db7d2f204c Merge branch 'master' into PHRAS-2385_port_local_manu_refacto 2019-01-15 10:59:53 +01:00
Nicolas Maillat
efa402391d Merge pull request #2893 from alchemy-fr/PHRAS-2368_change_elasticsearch_index_creation 
PHRAS-2368 Change cmd elasticsearch create index
 2019-01-15 10:45:43 +01:00
Filip Vilic
f249d530b3 PHRAS-2385_port_local_manu_refacto 2019-01-14 15:21:12 +01:00
Nicolas Maillat
dc1c5c2750 PHRAS-2368 Change cmd elasticsearch create index 
Cmd bin/console s:c:p is deprecated
 2019-01-14 12:48:39 +01:00
Nicolas Maillat
e3932990b0 Merge pull request #2890 from xrousset78800/fix/add-python-to-apt-packages-to-fix-elastic-provisionning 
PHRAS-2368 Add python dependencies to server packages to fix elastics…
 2019-01-14 10:15:17 +01:00
xrousset78800
718c9dcb96 Merge branch 'master' into fix/add-python-to-apt-packages-to-fix-elastic-provisionning 2019-01-11 19:29:50 +01:00
Xavier Rousset
3466d4f861 PHRAS-2368 Add python dependencies to server packages to fix elasticsearch setup 2019-01-11 16:58:59 +01:00
Nicolas Maillat
63531bb7a1 Merge pull request #2889 from aynsix/PHRAS-2379-port-migrate-field-type-text-to-string 
PHRAS-2379 Port to 4.1 Migrate all field type text to string
 2019-01-11 15:45:45 +01:00
aina-esokia
d2bdd2ed4a port 4.1: migrate field type text to string 2019-01-11 14:45:33 +04:00
aina-esokia
158e3eb2df port fix preview pdf in pdfjs 2019-01-10 18:29:47 +04:00
Nicolas Maillat
8c41dc28c7 Merge pull request #2883 from alchemy-fr/PHRAS-2372_port_to_4.1_strict_thesaurus_search 
PHRAS-2372 strict thesaurus search when indexing
 2019-01-09 17:12:09 +01:00
Nicolas Maillat
0be1f5d140 PHRAS-2372 strict thesaurus search when indexing 2019-01-09 17:00:06 +01:00
Nicolas Maillat
55c61b0fe0 Translated using Weblate (English) 
Currently translated at 95.6% (2272 of 2376 strings)
 2018-12-31 12:56:54 +01:00
Nicolas Maillat
2e0df9ff39 Translated using Weblate (French) 
Currently translated at 92.7% (2204 of 2376 strings)
 2018-12-31 12:50:03 +01:00
aynsix
c20d385292 PHRAS-2329 Port to master : log_doc error when move a record between collections (#2867) 
* port PHRAS-2317 fix: wrong coll_id in log_docs when move collection

* update
 2018-12-26 09:41:08 +01:00
Nicolas Maillat
331127d091 Merge pull request #2863 from filipx/PHRAS-2350_report_method_fix 
PHRAS-2350_report_method_fix
 2018-12-19 09:42:43 +00:00
Filip Vilic
bff7dec769 PHRAS-2350_report_method_fix 2018-12-19 10:12:14 +01:00
Nicolas Maillat
c2386d4e16 Merge pull request #2857 from filipx/PHRAS-2342_report_collections_fix 
PHRAS-2342_report_collections_fix
 2018-12-17 11:23:41 +00:00
Filip Vilic
91aaf2c6d7 PHRAS-2342_report_collections_fix 2018-12-14 12:18:24 +01:00
Nicolas Maillat
2b0edafc49 Merge pull request #2855 from filipx/PHRAS-2327_report_refacto_41 
PHRAS-2327_report_refacto_41 base collections fix
 2018-12-13 14:56:22 +00:00
Filip Vilic
5a291a549c PHRAS-2327_report_refacto_41 base collections/fields fix 2018-12-13 15:22:56 +01:00
Filip Vilic
d824b3158f PHRAS-2327_report_refacto_41 base collections fix 2018-12-13 13:58:51 +01:00
Nicolas Maillat
691f3b057d Merge pull request #2851 from filipx/PHRAS-2327_report_refacto_41 
Phras 2327 report refacto 41
 2018-12-12 10:39:59 +00:00
Filip Vilic
734d16a7e5 PHRAS-2327_report_refacto_41 root test fix 2018-12-12 11:03:31 +01:00
Filip Vilic
9bab2d8779 PHRAS-2327_report_refacto_41 fix 2018-12-12 10:29:05 +01:00
Filip Vilic
3fe4247953 PHRAS-2327_report_refacto_41 remove old tests 2018-12-11 14:15:48 +01:00
Filip Vilic
5268fb854b PHRAS-2327_report_refacto_41 translation files 2018-12-11 13:25:12 +01:00
Filip Vilic
eec09e55cd PHRAS-2327_report_refacto_41 2018-12-11 13:15:03 +01:00
Nicolas Maillat
35d0b0fad2 Merge pull request #2831 from jygaulier/PHRAS-1326_intl-labels-in-facets_MASTER 
PHRAS-1326_intl-labels-in-facets_MASTER
 2018-12-05 14:09:22 +00:00
Nicolas Maillat
36bf66fd9a Merge pull request #2828 from filipx/PHRAS-2311_refacto_basket_menu 
PHRAS-2311_refacto_basket_menu
 2018-12-04 15:03:02 +00:00
Jean-Yves Gaulier
61058a3658 PHRAS-1326_intl-labels-in-facets_MASTER 
add "labels" array to facets
 2018-11-27 19:33:36 +01:00
jygaulier
e2f5afc07b PHRAS-2292_aggregates-as-new-json_MASTER (#2829) 
* PHRAS-2292_aggregates-as-new-json_MASTER
wip

* PHRAS-2292_aggregates-as-new-json_MASTER

* PHRAS-2292_aggregates-as-new-json_MASTER
fake commit to test circle (did not run on last commit !)
 2018-11-27 10:25:28 +01:00
Filip Vilic
a2e711510d PHRAS-2311_refacto_basket_menu 2018-11-26 16:08:57 +01:00
Nicolas Maillat
b78707090c Merge pull request #2825 from aynsix/PHRAS-2306-port-search-thesaurus-all-language 
PHRAS-2306 port to 4.1 search thesaurus term to all language
 2018-11-26 09:29:14 +00:00
aina-esokia
d413c86912 port to 4.1 search thesaurus term to all language 2018-11-26 10:48:57 +04:00