hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

1866 Commits

Author SHA1 Message Date
Mike Ng
0c3918b8a5 updating code 2017-11-17 14:21:11 +04:00
Nicolas Maillat
40772aeea2 Merge pull request #2230 from mike-esokia/PHRAS-1522_PORT_PHRAS-1337 
PHRAS-1522 port PHRAS-1337
 2017-11-15 15:21:13 +01:00
Mike Ng
197612de7b implementation back-end for refactoring of orders 
refactoring layout order-box and order-item
 2017-08-17 14:42:10 +04:00
Mike Ng
40f88ed678 port PHRAS-1337 to 4.1 2017-08-16 09:56:08 +04:00
Mike Ng
191a59c827 add search to candidate tab 
refactor search_term function in backend
 2017-08-15 12:54:16 +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
9ff43945ba Fix merge errors 2016-12-06 14:04:38 +01:00
Thibaud Fabre
23c939f13c Merge master 2016-12-05 17:48:19 +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
jygaulier
b7d2db2bea Merge pull request #2012 from jygaulier/PHRAS-830_CANDIDATES-CACHED 
PHRAS-830_CANDIDATES-CACHED
 2016-11-29 18:23:33 +01:00
Thibaud Fabre
88a2813843 Refactor setup controller and registry manipulator 2016-11-25 14:03:01 +01:00
Thibaud Fabre
53c2182588 PHRAS-1092 Prevent password reset when saving config in admin 2016-11-25 11:47:43 +01:00
Thibaud Fabre
d00d674cdf Fix document substitution 2016-11-24 17:21:11 +01:00
Thibaud Fabre
2c35af060e Fix download permalink in unauthenticated contexts 2016-11-16 17:32:54 +01:00
Jean-Yves Gaulier
120f311e5c PHRAS-830_CANDIDATES-CACHED 
fix : Loading cterms was not possible if the already loaded list was empty (missing html tag). Not a cache problem.
 2016-11-08 16:57:24 +01:00
Jean-Yves Gaulier
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02: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
dedd763581 Refactor databox service and controller 2016-10-19 07:00:33 +02:00
Thibaud Fabre
9a44033c00 Use databox service to mount databoxes in admin 2016-10-19 06:51:37 +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
0a1d248969 Merge pull request #1983 from alchemy-fr/feature/download-intent 
PHRAS-1225 Log downloads triggered via permalinks
 2016-10-13 17:01:19 +02:00
Thibaud Fabre
a82297def6 PHRAS-1225 Log downloads triggered via permalinks 2016-10-13 16:18:27 +02:00
Thibaud Fabre
fd61435468 Improve task manager logs 
Available versions are now sorted by date in descending order
 2016-10-13 15:23:25 +02:00
Thibaud Fabre
e77178d757 Add delivery results to application settings page 2016-10-13 14:05:53 +02:00
Thibaud Fabre
f2b956b015 Merge pull request #1968 from jygaulier/PHRAS-946_delete-record-api 
PHRAS-946_delete-record-api
 2016-09-29 17:41:24 +02:00
Jean-Yves Gaulier
c6186abe56 PHRAS-946_delete-record-api 
- add : api route to delete record : verb DELETE ; /api/v1/records/{{databox_id}}/{{record_id}}
 2016-09-29 15:54:04 +02:00
Thibaud Fabre
cdc410191c Merge pull request #1960 from jygaulier/PHRAS-1192_quarantaine-by-filenames_4.0 
PHRAS-1192_quarantaine-by-filenames_4.0
 2016-09-29 14:11:08 +02:00
Thibaud Fabre
08a8970147 Merge pull request #1944 from jygaulier/PHRAS-842_search-logged-as-es_4.0 
PHRAS-842_search-logged-as-es_4.0
 2016-09-29 14:10:21 +02:00
Thibaud Fabre
9597a775e2 Merge pull request #1964 from alchemy-fr/4.0 
Merge 4.0 into master
 2016-09-29 09:32:30 +02:00
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Thibaud Fabre
73826d535c PHRAS-1248 Merge branch '4.0' 
Conflicts:
	Makefile
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Collection/CollectionService.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php
	lib/classes/record/adapter.php
	resources/ansible/roles/app/tasks/main.yml
	resources/www/prod/js/jquery.Edit.js
	resources/www/prod/js/jquery.main-prod.js
	resources/www/prod/skins/ui-components/_answers-tools.scss
	templates/web/common/dialog_export.html.twig
	templates/web/prod/thesaurus.js.twig
 2016-09-28 19:52:33 +02:00
Jean-Yves Gaulier
837a294827 PHRAS-1192_quarantaine-by-filenames_4.0 
- add : quarantine thumbnails looks like result thb (zoom, caption, infos, ...) by using the same template
 - removed : some code about highlighting titles
 - fix : double extension on exported files
 2016-09-28 13:16:10 +02:00
Thibaud Fabre
ebc515f2c1 PHRAS-1006 Add order manager in API collection description 2016-09-27 10:38:34 +02:00
Jean-Yves Gaulier
827e4fe255 PHRAS-842_search-logged-as-es_4.0 
- fix : query is logged in a "user" form, before parsing
 2016-09-22 15:16:36 +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
98dbb863fe Merge pull request #1927 from jygaulier/PHRAS-1190_prod-search-thesaurus 
PHRAS-1190_prod-search-thesaurus
 2016-07-19 15:36:55 +02:00
Jean-Yves Gaulier
19342cf45c PHRAS-1190_prod-search-thesaurus 
- removed comment
- test is ok (no more timeout) but without changes from first commit (???)
 2016-07-19 13:46:27 +02:00
Jean-Yves Gaulier
0dac4a4573 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 12:00:47 +02:00
Jean-Yves Gaulier
5ae1b8355d PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 11:37:46 +02:00
Jean-Yves Gaulier
69914dee31 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-18 16:42:52 +02:00
Jean-Yves Gaulier
1abe2463e8 PHRAS-1190_prod-search-thesaurus 
- fix : prod / thesaurus search is ok (language doesn't care)
#time 2h
 2016-07-18 15:32:27 +02:00
Florian BLOUET
75b172b7cf Bump Phraseanet Production Client 
update video tools features
- add sequencial hotkey for play speed: (L) (LL) (LLL...)
 2016-07-08 15:30:37 +02:00
Florian BLOUET
3258d91f73 Bump Phraseanet Production Client 
update video tools features
- add keyboard shortcuts: move up/down ranges in list
- fix loop if end range match the end of the video
- fix play/pause race condition
 2016-07-08 12:12:25 +02:00
Florian BLOUET
6774f5cd9e Bump Phraseanet Production Client 
update video tools features, fix misc issues
    - fix pym.js integration issues
    - fix record editor's preview tab
    - add video Editor in record Editor
    - export VTT content to VideoTextTrack field
 2016-07-06 13:45:15 +02:00
Thibaud Fabre
3072125658 Fix include resolution for search type 2 2016-07-02 15:40:32 +02:00