hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,699 Commits 268 Branches 107 Tags
c48b490e18c5b7cd94c81ed4b3a700fe90b78267
Commit Graph

377 Commits

Author SHA1 Message Date
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
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
1917b3dba3 Merge branch 4.0 into master 2016-05-25 17:21:08 +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
Benoît Burnichon
db3bb2d4c4 Slight refactor of set_export to avoid N+1 2016-05-20 10:18:30 +02:00
Benoît Burnichon
60b932d518 Merge branch '4.0' into merge-4.0 
- Ignore modifications in Vagrantfile. Complete rework switching to ansible
- redo composer update of roave/security-advisories and symfony/symfony
- confirm deletion of jquery.WorkZone.js

Conflicts:
	Vagrantfile
	composer.lock
	resources/www/prod/js/jquery.WorkZone.js
 2016-05-12 10:43:30 +02:00
Benoît Burnichon
8e693964df Refactor getChildren() and get_grouping_parents() 2016-05-11 17:50:57 +02:00
Benoît Burnichon
ea9458da77 Avoid calling cache when data is already present 2016-05-11 17:50:57 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
033542ac2f Remove some arguments from query and add them to options 2016-04-15 16:36:28 +02:00
Benoît Burnichon
11b63e5a2b Add missing property copy on mirror 2016-04-13 22:04:45 +02:00
Benoît Burnichon
0fb219cb67 Remove legacy record_adapter::get_status 2016-04-13 19:55:54 +02:00
Benoît Burnichon
4171ab9e8d Rename record_adapter::get_status into getStatus 2016-04-13 19:51:56 +02:00
Benoît Burnichon
7a25b499e3 Deprecated set_binary_status and use setStatus instead. 2016-04-13 18:50:39 +02:00
Scrutinizer Auto-Fixer
8d845eabbc Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-04-12 12:11:15 +02:00
Benoît Burnichon
ac2351bd19 fixup several issues 2016-04-12 12:11:13 +02:00
Benoît Burnichon
23580bbd6a Add save capability to MediaSubdefRepository 2016-04-12 12:11:13 +02:00
Benoît Burnichon
72e53b5687 several fixups 2016-04-12 12:11:13 +02:00
Benoît Burnichon
6140c5cc73 Refactor media_subdef 2016-04-12 12:11:13 +02:00
Jean-Yves Gaulier
e6b1ad4f2f PHRAS-1055 #time 1h 
- no bug concerning --max_record
- add try/catch so the job don't stop on errors

PHRAS-1055 #time 5h
- add option --dry
- add verbose print (-v)
- add "ALL" for type and subdef arguments
- fix "substitute" options
- fix show sql with arguments

PHRAS-1055 #time 5h
- better error handling
- argument "databox" can be specified as id, dbname or viewname
- add option "--partition=n/N"
- argument "type" changed to option "--record_type=a,b,c" (can also be set as "--record_type=a,b --record_type=c")
- argument "subdefs" changed to option "--name=x,y,z" (can also be set as "--name=x,y --name=z")
- option "--with-substitution" changed to "--with_substituted"
- option "--substitution-only" changed to "--substituted-only"

PHRAS-1055 #time 2h
- change lone argument (databox) to option "--databox" (mandatory)
- add option "--missing_only" to create missing subdefs after structure change.
- add option "--garbage_collect" to remove orphan subdefs left by structure change.

PHRAS-1055 #time 1m
- cleanup

PHRAS-1055 #time 2h
- cleanup
- add option "--reset_subdef_flag"
- add option "--set_writemeta_flag"

PHRAS-1055 #time 1m
- fix vocabulary (flag)
 2016-04-06 11:36:00 +02:00
Jean-Yves Gaulier
4e37af6386 PHRAS-1055 #time 2h 
- change lone argument (databox) to option "--databox" (mandatory)
- add option "--missing_only" to create missing subdefs after structure change.
- add option "--garbage_collect" to remove orphan subdefs left by structure change.
 2016-04-04 14:41:19 +02:00
Benoît Burnichon
35a4111cf3 Slight refactoring of caption_record, databox_field and record_adapter 2016-03-30 11:49:50 +02:00
Benoît Burnichon
c89bf664b5 Remove unused highlighting parameters 2016-03-29 19:11:48 +02:00
Benoît Burnichon
d33a1d0dcc PHPCS fixing 2016-03-29 18:58:54 +02:00
Benoît Burnichon
c580b55c3e Remove one N+1 by fetching TechnicalDataSets 2016-03-29 14:57:44 +02:00
Benoît Burnichon
5ee7f3689a Use recently added getDataboxConnection method 2016-03-07 12:29:05 +01:00
Benoît Burnichon
e01088d38d Add RecordReference into record_adapter 2016-03-07 12:28:40 +01:00
Benoît Burnichon
f1cd8d7449 Fixup some behaviour in record_preview 2016-03-07 00:29:56 +01:00
Benoît Burnichon
7399e3de56 record_preview PHPCS and property typo fix 2016-03-06 23:30:39 +01:00
Benoît Burnichon
b9f1f84020 More deprecation removal 2016-03-06 23:30:12 +01:00
Benoît Burnichon
6cdc9d7a31 Remove some deprecated methods calls 2016-03-06 23:05:55 +01:00
Benoît Burnichon
b7cda69182 Use recently added getDataboxConnection method 2016-03-04 14:21:22 +01:00
Benoît Burnichon
8e599e554c Add RecordReference into record_adapter 2016-03-04 14:21:22 +01:00
Benoît Burnichon
5975178749 Merge branch '4.0' 
Also updated dependencies
 2016-02-28 23:31:16 +01:00
Benoît Burnichon
6e1be6099f Avoid cache requests on subdef already in cache. 2016-02-26 16:18:11 +01:00
Benoît Burnichon
557c98a9b9 Changes on SubdefGroup reflected in using clients 2016-02-24 13:54:35 +01:00
Benoît Burnichon
c63f8d777f Merge branch '4.0' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/ControllerProvider/Api/V2.php
 2016-02-23 16:27:04 +01:00
Benoît Burnichon
8a907e9bb0 Add touch capability to record_adapter. 2016-02-23 10:40:01 +01:00
Benoît Burnichon
810bef41fb rename is_downloable to isDownloable 
Change Functional to unit test
 2016-02-10 16:01:24 +01:00
Benoît Burnichon
fae284d482 media_subdef could sometimes be constructed without a proper URL 
Introduced by #1626
 2016-02-05 15:36:19 +01:00
Benoît Burnichon
afde09645a WIP 2016-02-05 15:36:19 +01:00
Benoît Burnichon
3544f70130 PHPCS record_adapter 2016-01-27 11:00:54 +01:00
Benoît Burnichon
14cd8a1903 Use existing SubdefSubstituer service i/o record_adapter 2016-01-26 19:17:41 +01:00
Benoît Burnichon
614394edc7 Method renaming 2016-01-26 14:25:08 +01:00
Benoît Burnichon
f501cba16b Extract whether subdef metadata updates are required 2016-01-22 17:39:33 +01:00
Benoît Burnichon
85c5311281 Move removal in symlink in symlinker 2016-01-14 11:07:17 +01:00