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
12,606 Commits 268 Branches 107 Tags
c58ed453334a0dd5ae4bd5d0a23a85e65ca36dc2
Commit Graph

12606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aina-esokia
c58ed45333 fix prod escaping 2018-11-22 14:32:42 +04:00
aina-esokia
06e30750e4 fix escape in admin connected-user 2018-11-22 14:21:12 +04:00
aina-esokia
4668e8a954 fix escape lightbox 2018-11-22 14:16:31 +04: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
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
Nicolas Maillat
c0727378f4 PHRAS-2186 
Change
Node.js is now version 10.12.0
 2018-10-24 15:50:18 +02:00
Xavier Rousset
a8ebe5fc43 Update access page design 2018-10-19 19:10:39 +02:00
Nicolas Maillat
61782f5596 Merge pull request #2784 from aynsix/PHRAS-2271-port-api-setmetadatas 
PHRAS-2271 Port to 4.1 - PHRAS-2268 API / setmetadatas does not trigger metadatas writting job on the file
 2018-10-18 11:40:39 +00:00
aina-esokia
d2b3d96760 update jeton when set metadatas 2018-10-18 14:30:37 +04:00
Nicolas Maillat
54adcfb73d Merge pull request #2778 from jygaulier/PHRAS-2264_html-encode-title_MASTER 
PHRAS-2264_html-encode-title_MASTER
 2018-10-16 16:38:02 +00:00
Nicolas Maillat
ebf28daa27 Merge pull request #2745 from xrousset78800/PHRAS-2237/update-access-demand-table-display 
PHRAS-2237 - Update table design to keep space when no entry in field
 2018-10-16 15:41:58 +00:00
Jean-Yves Gaulier
e6c89e22bf PHRAS-2264_html-encode-title_MASTER 
fix encoding of title
 2018-10-15 18:44:38 +02:00
Nicolas Maillat
2dd069f173 Merge pull request #2771 from aynsix/PHRAS-2258-quarantine-speciale-characters 
PHRAS-2258 Quarantine - special characteres in filename of uploaded file, block actions, (add, substitute, delete).
 2018-10-11 09:54:25 +00:00
Nicolas Maillat
a496a530d2 Merge pull request #2770 from aynsix/PHRAS-2257-quarantine-substitute-nok 
PHRAS-2257 Prod IHM - Quarantine - Substitute action for asset is NOK.
 2018-10-11 09:54:11 +00:00
aina-esokia
2639b71c36 filter special characterin filename when created lazaretfile 2018-10-10 18:36:32 +04:00
aina-esokia
39ec2d5e56 fix quarantine substitue action 2018-10-10 18:29:24 +04:00