hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,668 Commits 268 Branches 107 Tags
00979f2d6d256e8b8ff580090acb5ba80f498ebd
Commit Graph

2912 Commits

Author SHA1 Message Date
Thibaud Fabre
d00d674cdf Fix document substitution 2016-11-24 17:21:11 +01:00
Xavier Rousset
8758756c16 PHRAS-1286 Add missing notifications to the list 2016-11-21 15:09:45 +01:00
Jean-Yves Gaulier
3a0517774c PHRAS-1155_UPDATE-3.8-4.0-FAILS 
fix : the new column "Orders.notification_method" creation (2016...) is moved to an older patch (2013...) since this patch runs on 2016 orm object "Orders"
 2016-11-09 15:22:19 +01:00
Jean-Yves Gaulier
75a44812d6 PHRAS-828_CTERMS-NOT-PURGED 
- fix : cterms are cleared before reindexation (admin button) or populate (cli) ; terms in "stock" are preserved.
 nb.: rejected terms (red) are also purged so a term may pop-up again as candidate even if it had been rejected before.
 2016-11-07 18:38:51 +01:00
jygaulier
9d16ee8809 Merge pull request #2009 from jygaulier/PHRAS-1279_SUBSTITUTE-UNKNOWN-TYPE 
PHRAS-1279_SUBSTITUTE-UNKNOWN-TYPE
 2016-11-03 19:01:55 +01:00
Jean-Yves Gaulier
b526d0ecdc PHRAS-1279_SUBSTITUTE-UNKNOWN-TYPE 
- new : added missing options (settings) "size", "resolution", ... to "unknown"-type subdef
 2016-11-03 18:48:57 +01:00
Thibaud Fabre
77c848f32e Merge pull request #2008 from jygaulier/PHRAS-1260_INDEX-WIDTH-HEIGHT 
Phras 1260 index width height
 2016-11-03 16:22:26 +01:00
Jean-Yves Gaulier
229c80fe74 PHRAS-1260_INDEX-WIDTH-HEIGHT 
- new : added size (filesize) of document to es
 - new : methods getWidth(),... to record_adapter
 - fix : template
 2016-11-03 15:27:57 +01:00
Jean-Yves Gaulier
a7fe5090c6 PHRAS-508_acl-cache 
- fix ref on pdo stmt. again.
 2016-10-27 18:38:33 +02:00
Jean-Yves Gaulier
e42bb376f8 PHRAS-508_acl-cache 
- fix ref on pdo stmt
 2016-10-27 18:32:39 +02:00
Jean-Yves Gaulier
ce0aeaff0e PHRAS-508_acl-cache 
- fix "static" into method causing side effects
 2016-10-27 18:23:27 +02:00
Jean-Yves Gaulier
343967b7c3 PHRAS-508_acl-cache 
- wip
 2016-10-27 17:51:04 +02:00
Jean-Yves Gaulier
a5aecacefe PHRAS-508_acl-cache 
- tryout without cache
 2016-10-27 15:38:23 +02:00
Jean-Yves Gaulier
fe7f3762dd PHRAS-508_acl-cache 
- fix for tests
 2016-10-27 15:07:31 +02:00
Jean-Yves Gaulier
45eea29710 PHRAS-508_acl-cache 
- fix unit tests
 2016-10-26 19:14:11 +02: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
efc5842e06 Add create databox console command 2016-10-19 06:51:37 +02:00
Thibaud Fabre
15c533f709 PHRAS-1251 Replace webhook job by queue worker 2016-10-10 11:19:44 +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
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
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
Jean-Yves Gaulier
734904c5e2 PHRAS-1192_quarantaine-by-filenames_4.0 
- fix : export of caption is ok (was failing with 404)
 - fix : codestyle
 2016-09-28 16:38:29 +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
moctardiouf
4ff084ffe5 fix syntax error text_mail_receiver 2016-09-16 19:21:27 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
Jean-Yves Gaulier
e10a6f8ebd PHRAS-1177_change-multi-on-field 
- change : no more "multi" checkbox when creating a field
- new field is not "report" anymore
#time 1h
 2016-06-27 16:45:51 +02:00
Jean-Yves Gaulier
6572f3ba14 PHRAS-1177_change-multi-on-field 
- fix : multi field gets the default separator
#time 10m
 2016-06-23 20:39:09 +02:00
Jean-Yves Gaulier
deafb8b957 PHRAS-1177_change-multi-on-field 
- add : now the "multi" attribute on a field can be changed after creation
- change : field template
#time 3h
 2016-06-23 20:22:25 +02:00
Jean-Yves Gaulier
9e891d4ae9 PHRAS-1164_Backport-PHRAS-1158-to-4.0 
#time 20m
 2016-06-16 16:02:26 +02:00
Jean-Yves Gaulier
169a2f3a36 PHRAS-1158_STAMP-CHANGE-COLL 
change : deleting stamp via record, not collection
 2016-06-16 15:19:20 +02:00
Jean-Yves Gaulier
c040511320 PHRAS-1158_STAMP-CHANGE-COLL 
change : stamp reset moved to event subscriber
 2016-06-16 13:54:45 +02:00
Jean-Yves Gaulier
51ff2e040a PHRAS-1158_STAMP-CHANGE-COLL 
fix : the stamp was not updated when a record changed of collection
#time 2h
 2016-06-16 13:54:45 +02:00
Thibaud Fabre
82c6f809c9 Fix duplicated extensions 2016-06-14 09:36:49 +02:00
Thibaud Fabre
fab4a6e6d5 Fix incorrect file names for filename containing dots 2016-06-13 18:57:23 +02:00
Mathieu Justeau
6a3bddf259 Fix upgrade from 3.8 to 4.0 2016-05-27 16:21:19 +00:00
Thibaud Fabre
1917b3dba3 Merge branch 4.0 into master 2016-05-25 17:21:08 +02:00
Thibaud Fabre
a2ae899121 PHRAS-573 Add status rights in /me response 2016-05-25 14:08:34 +02:00
Thibaud Fabre
bf08667d0d PHRAS-572 List user rights by databox in /me route 2016-05-25 11:57:03 +02:00
Thibaud Fabre
b96917f908 Merge pull request #1831 from bburnichon/improvement/search 
Search API
 2016-05-23 14:17:25 +02:00
Florian BLOUET
91bfa11754 PHRAS-851 - add databox name, collection name and logo to record title in preview 
Bump Phraseanet Production Client
 2016-05-23 11:52:35 +02:00
Florian BLOUET
b7a3571d04 PHRAS-851 - add databox name, collection name and logo to record title in preview 2016-05-23 11:36:25 +02:00
Thibaud Fabre
f489043280 Merge pull request #1872 from bburnichon/bug/slash-in-permalink-labels-PHRAS-1079 
Slash in permalink labels
 2016-05-20 17:41:38 +02:00
Benoît Burnichon
2d60fe854e str_replace / by _ in labels of permalinks 2016-05-20 17:19:46 +02:00
Benoît Burnichon
086e7c126c Enlarge FeedEntry length to 1024 chars 2016-05-20 17:01:36 +02:00
Benoît Burnichon
2547ef14fa Add Archive download to Api v2 orders 2016-05-20 13:16:41 +02:00
Benoît Burnichon
db3bb2d4c4 Slight refactor of set_export to avoid N+1 2016-05-20 10:18:30 +02:00