hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,135 Commits 268 Branches 107 Tags
6fd11b630b64e18ba5a69950b75a611ab957a76f
Commit Graph

934 Commits

Author SHA1 Message Date
Mike Ng
b08b3a5fd8 PORT PHRAS-854 to 4.1 2018-02-19 11:04:47 +04:00
aynsix
df85aa8827 PHRAS-1797 porting searchengine:index to 4.1 (#2454) 
* portage commande searchengine:index vers 4.1

* FIX Indexer

* Update DataboxFetcherFactory.php
 2018-01-30 18:50:57 +01:00
Mike Ng
2644962783 Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 2018-01-09 11:01:01 +04:00
Mike Ng
4c11cfebd8 Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 2018-01-09 09:50:57 +04:00
Mike Ng
a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:46 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
bddc3781ba resolve conflict 2018-01-08 15:54:47 +04:00
Nicolas Maillat
c2603da5ad Merge pull request #2373 from falylala/PHRAS-1717-PORT_Install_show_available_documentary 
PHRAS-1717- PORT_1296_Show all available structure for install CLI/Graphic mode
 2018-01-08 12:33:19 +01:00
Mike Ng
e9e9a737c3 PORT PHRAS-1559 and PHRAS-1560 to 4.1 2017-12-13 10:26:24 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
falylala
ea53da9086 Show all available structure for install CLI/Graphic mode 2017-11-20 12:16:54 +04:00
jygaulier
a70bf2fc70 PHRAS-1304_AUTO-COMPLETION_MASTER (#2061) 
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp

* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)

* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!

* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake

* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
 2017-02-06 18:26:56 +01:00
Thibaud Fabre
cc6efb0dc9 Merge 4.0 into master 2016-12-06 15:34:13 +01:00
Thibaud Fabre
c39f4117bd PHRAS-1289 Add group rights to compiled configuration 2016-12-06 15:01:12 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Thibaud Fabre
88a2813843 Refactor setup controller and registry manipulator 2016-11-25 14:03:01 +01:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Thibaud Fabre
eb0177a60b Clean up switch case 2016-10-26 12:16:53 +02:00
Thibaud Fabre
6f534b6204 Refactor translator null checks 2016-10-26 12:07:09 +02:00
Thibaud Fabre
2aacbb789e Fix term indexer creation 2016-10-19 14:01:43 +02:00
Thibaud Fabre
b345ef7ac7 Fix indexer dependency injection 2016-10-19 13:31:39 +02:00
Thibaud Fabre
c133b42716 Refactoring 
- Split search engine service registration into sub-methods
- Remove unused properties
- Fix coding style
 2016-10-19 13:31:17 +02:00
Thibaud Fabre
f5452eac1e Check for undefined key 2016-10-19 13:31:17 +02:00
Thibaud Fabre
6e88b97c55 Extract record index and term index from respective indexers 2016-10-19 13:31:16 +02:00
Jean-Yves Gaulier
06a66a916f PHRAS-1271_better-buildsubdefs 
- new :  doc
 - changed : some options are mandatory
 - changed : es logging to app['monolog'] to respect not-verbose mode (no more broken progress-bar due to log on screen)
 2016-10-19 11:22:11 +02:00
Thibaud Fabre
32fe54ac35 Add databox mount command 2016-10-19 06:51:37 +02:00
Thibaud Fabre
efc5842e06 Add create databox console command 2016-10-19 06:51:37 +02:00
Thibaud Fabre
a040dc2aea Merge pull request #1988 from alchemy-fr/jygaulier-PHRAS-714 
Improve architecture
 2016-10-18 22:17:32 +02:00
Thibaud Fabre
79a9411923 Code architecture 
- Remove circular dependency between indexer and record indexer
- Restore interface type hints on indexer methods
 2016-10-18 21:17:38 +02:00
Thibaud Fabre
4acd20fa80 Revert "Revert "PHRAS-714_thesaurus_indexation"" 2016-10-18 21:17:10 +02:00
Thibaud Fabre
ba8be47423 Revert "PHRAS-714_thesaurus_indexation" 2016-10-18 20:15:23 +02:00
Thibaud Fabre
e413eff4f9 Merge pull request #1978 from jygaulier/PHRAS-714 
PHRAS-714_thesaurus_indexation
 2016-10-18 10:11:46 +02:00
Thibaud Fabre
0c8f507abe PHRAS-1236 Add native session handler config option 
Allows use of custom session handlers via php.ini
 2016-10-13 14:29:23 +02:00
Jean-Yves Gaulier
cf40c99ea7 PHRAS-714_thesaurus_indexation 
- new : if the thesaurus has been modified since it's last indexation, it will be re-indexed as soon a record is to be indexed.
 - nb : after thesaurus modification, the databox MUST be manually re-indexed (which will reindex the thesaurus before)
 - todo : remove useless dialog boxes from thesaurus app (... "this term was..."  "...add with/out reindexing ?..."). To be done in the future app using future routes.
 2016-10-12 18:42:16 +02:00
Thibaud Fabre
91aae6a236 Merge pull request #1945 from jygaulier/PHRAS-1178_edit-story-and-records_4.0 
PHRAS-1178_edit-story-and-records_4.0
 2016-09-29 14:10:47 +02:00
Thibaud Fabre
b98d8a38b2 Fix webhook repository test 2016-09-28 21:35:48 +02:00
Thibaud Fabre
73be6d5615 PHRAS-1239 Add webhook for user deleted events 2016-09-28 21:35:48 +02:00
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Jean-Yves Gaulier
877beaa40d PHRAS-1178_edit-story-and-records_4.0 
- change : if a record is updated, every "parent" story is considered as updated too (editDateField(s) set)
 - fix : cache is now invalidated after editing records
 - fix : recordeditsuscriber can't run into recursion anymore
 2016-09-28 17:43:37 +02:00
Thibaud Fabre
051eb0a2bf PHRAS-1210 Remove invalid assignment 2016-09-22 18:11:24 +02:00
Jean-Yves Gaulier
1c1e9cf723 PHRAS-1216_story-cover-changed-event 
- fix : class name/extend changed,
#time 10m
 2016-09-21 15:47:55 +02:00
Jean-Yves Gaulier
e10971a88f PHRAS-1216_story-cover-changed-event 
#time 1h
 2016-09-21 15:13:12 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
jygaulier
d558192a74 Merge pull request #1910 from jygaulier/PHRAS-1168_Backport-PHRAS-1094-to-4.0 
PHRAS-1168_Backport-PHRAS-1094-to-4.0
 2016-07-18 13:32:27 +02:00
Thibaud Fabre
9ca8dee44f PHRAS-1180 Add configuration entry to enable CORS on custom paths 2016-07-12 14:22:12 +02:00
Jean-Yves Gaulier
b49a5ceda5 PHRAS-1168_Backport-PHRAS-1094-to-4.0 
(update php-es lib)
#time 30m
 2016-06-16 17:57:04 +02:00
Jean-Yves Gaulier
9e891d4ae9 PHRAS-1164_Backport-PHRAS-1158-to-4.0 
#time 20m
 2016-06-16 16:02:26 +02:00
Thibaud Fabre
b3035dd867 Configure CORS for download path 2016-06-14 10:32:18 +02:00