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,617 Commits 268 Branches 107 Tags
5268fb854b22fa453794fccfa04c2e3d04e13c0d
Commit Graph

12617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicolas Maillat
5fce1c4311 Merge pull request #2823 from filipx/PHRAS-2301_thesaurus_concept_path_port_41 
PHRAS-2301_thesaurus_concept_path_port_41 fix
 2018-11-23 10:51:53 +00:00
Filip Vilic
688caea0d9 PHRAS-2301_thesaurus_concept_path_port_41 fix 2018-11-23 10:28:47 +01:00
Nicolas Maillat
7177c90eca Merge pull request #2818 from filipx/PHRAS-2301_thesaurus_concept_path_port_41 
PHRAS-2301_thesaurus_concept_path_port_41
 2018-11-22 15:02:20 +00:00
Filip Vilic
31fa5b14c6 PHRAS-2301_thesaurus_concept_path_port_41 translation files 2018-11-22 12:15:03 +01:00
Nicolas Maillat
8204a0056a fix typo 2018-11-21 19:08:42 +01:00
Nicolas Maillat
dc19422b98 fix typo 2018-11-21 19:05:34 +01:00
Nicolas Maillat
7ba99bf5e1 fix typo 2018-11-21 19:02:13 +01:00
Nicolas Maillat
9b0e517eb7 Update link 2018-11-21 18:59:14 +01:00
Filip Vilic
ed3513865e PHRAS-2301_thesaurus_concept_path_port_41 2018-11-21 13:13:42 +01:00
Nicolas Maillat
082b5309ad Merge pull request #2816 from aynsix/PHRAS-2144-autoincrement-after-system-upgrade 
PHRAS-2144 execute autoincrement after system:upgrade
 2018-11-20 15:16:21 +00:00
aina-esokia
f42d7e72d9 execute autoincrement after system:upgrade 2018-11-20 15:29:59 +04:00
Nicolas Maillat
eb2faf7885 Merge pull request #2812 from alchemy-fr/PHRAS-2296_clean_cache_repo 
PHRAS-2297 clean cache repo during makefiles
 2018-11-16 16:28:29 +00:00
Nicolas Maillat
b74a8825b6 PHRAS-2296 
Erase files contents of cache repo during make
 2018-11-16 17:08:36 +01:00
Nicolas Maillat
5e2a9d8b14 Merge pull request #2805 from filipx/PHRAS-2270_advance_search_port_top_41 
PHRAS-2270_advance_search_port_top_41
 2018-11-15 11:07:12 +00:00
Nicolas Maillat
10bd87ff3b Merge pull request #2711 from alchemy-fr/PHRAS-2204_api_webhook_task_error 
PHRAS-2204: Task Manager / Api webhook Task : error on event delivering
 2018-11-15 09:55:33 +00:00
Nicolas Maillat
965eff1e9e Merge pull request #2688 from jygaulier/PHRAS-2161_coll-id-in-log-docs_MASTER 
PHRAS-2161_coll-id-in-log-docs_MASTER
 2018-11-15 09:52:35 +00:00
Jean-Yves Gaulier
8a26b72293 PHRAS-2189_report-v2_MASTER 
disable some tests
 2018-11-14 18:06:29 +01:00
Jean-Yves Gaulier
18cff53c61 PHRAS-2189_report-v2_MASTER 
change patch version because we need to insert a patch before this one
wip
 2018-11-14 15:51:23 +01:00
Jean-Yves Gaulier
f7b103af3d PHRAS-2161_coll-id-in-log-docs_MASTER 
- explicit message when databox is failed to mount.
- reconnect db for long migration scripts
- mark (comment) doctrine "binary_strings" type so the upgrade is not done every time because the field was read-back as "varchar"
- proposal on long migration scripts (could be faster)
 2018-11-14 15:49:10 +01:00
Jean-Yves Gaulier
e94292a44c PHRAS-2161_coll-id-in-log-docs_MASTER 
add "from_coll_id" parameter to logger, used only when action="collection"
 2018-11-14 15:49:10 +01:00
Jean-Yves Gaulier
e2745cba9e PHRAS-2161_coll-id-in-log-docs_MASTER 
Optimize sql.
Add the "coll_id_from" column in "log_docs" for the "collection" action.
Hydrate a "coll_id" column in "log_view"
 2018-11-14 15:49:10 +01:00
Jean-Yves Gaulier
02efc2b9d1 PHRAS-2161_coll-id-in-log-docs_MASTER 
moved cli "patch:log_coll_id" from bin/developer to bin/setup
cs
 2018-11-14 15:48:41 +01:00
Jean-Yves Gaulier
9644efef00 PHRAS-2161_coll-id-in-log-docs_MASTER 
cs
 2018-11-14 15:48:41 +01:00
Jean-Yves Gaulier
02695e1006 PHRAS-2161_coll-id-in-log-docs_MASTER 
moved the compute/fix "log_docs.coll_id" from patch to cli.
 2018-11-14 15:48:41 +01:00
Jean-Yves Gaulier
4f736d9f96 PHRAS-2161_coll-id-in-log-docs_MASTER 
added coll_id in log_view

todo : compute/fill old values in log_view.coll_id

wip
 2018-11-14 15:46:56 +01:00
Jean-Yves Gaulier
6ad5dec136 PHRAS-2161_coll-id-in-log-docs_MASTER 
disable tests

todo : fix log2es plugin.

wip
 2018-11-14 15:46:16 +01:00
Jean-Yves Gaulier
1b1afe37ca PHRAS-2161_coll-id-in-log-docs_MASTER 
mysql fix : revert bad fix for default value for enum; fix default value for coll_id;

todo : fix log2es plugin.

wip
 2018-11-14 15:46:16 +01:00
Jean-Yves Gaulier
5c28f5250c PHRAS-2161_coll-id-in-log-docs_MASTER 
mysql fix : fix default value for enum

todo : fix log2es plugin.

wip
 2018-11-14 15:46:16 +01:00
Jean-Yves Gaulier
f130faccb6 PHRAS-2161_coll-id-in-log-docs_MASTER 
mysql fix : add "" to "action" (as default value) to structure
add: action "collection_from" to move_record in app

todo : fix log2es plugin.

wip
 2018-11-14 15:46:16 +01:00
Jean-Yves Gaulier
b65500bb40 PHRAS-2161_coll-id-in-log-docs_MASTER 
wip
 2018-11-14 15:42:24 +01:00
jygaulier
b8bebbce11 PHRAS-2189 report v2 master (#2742) 
move code to services
added "download" report
change services to factory
added excel lib
added prod/report routes (download)
cleanup api routes
add : allow anonymized (user, fonction, societe... are "-")
removed : xls support (memory eating lib) in favor of xlsx
add : report download only on "document" and "preview" subdef classes
cs : report factory
add : restored "site" filter (see todos in src)
remove debug, cs

todo : doc
 2018-11-12 19:43:40 +01:00
Filip Vilic
82d8c5d4c0 PHRAS-2270_advance_search_port_top_41 2018-11-07 12:54:57 +01:00
Nicolas Maillat
9298580888 Merge pull request #2789 from xrousset78800/fix/update-access-page-design 
Update access page design
 2018-11-06 16:26:42 +00:00
Nicolas Maillat
36395f25ac Merge pull request #2801 from aynsix/PHRAS-1864-port-41-1868-admin-mount-database 
PHRAS-1864 port to 4.1 PHRAS-1868 database mount
 2018-11-06 09:32:31 +00:00
Nicolas Maillat
1cfdb6af2c Merge pull request #2802 from aynsix/PHRAS-2274-port41-changing-status-in-log_docs 
PHRAS-2274 port to 4.1 PHRAS-2227 FIX changing status appear in log_docs table
 2018-11-06 09:32:11 +00:00
Nicolas Maillat
a4a224f6a6 Merge pull request #2800 from aynsix/PHRAS-2261-port-to-41-1831-thesaurus-search 
PHRAS-2261 Port to 4.1 - PROD / SEARCH / THESAURUS : not concerned assets in search result
 2018-11-06 09:31:27 +00:00
aina-esokia
18ff40a537 port to 4.1 PHRAS-2227 FIX changing status appear in log_docs table 2018-11-06 11:22:53 +04:00
aina-esokia
9c9d280250 port to 4.1 PHRAS-1868 database mount 2018-11-05 18:22:52 +04:00
aina-esokia
2eeb1721e9 port to 4.1 PHRAS-1831 2018-11-05 15:02:55 +04:00
xrousset78800
e113d926c2 PHRAS-1843 Add elasticsearch host setting in vars/all.yml file (#2791) 2018-11-01 17:13:18 +01:00
Nicolas Maillat
737e77b800 Merge pull request #2792 from alchemy-fr/PHRAS-2286_node_version_circleci 
PHRAS-2186
 2018-10-24 14:01:34 +00:00