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

2686 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
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
Thibaud Fabre
edaf603552 Merge pull request #1859 from bburnichon/improvement/search-v4 
Backport of #1831 into 4.0
 2016-05-19 16:42:17 +02:00
Benoît Burnichon
f0e2ff2bd1 Backport PHP7 issue fix in Youtube Bridge 2016-05-19 14:08:48 +02:00
Benoît Burnichon
71b370f766 Fixup calls order to avoid N+1 2016-05-19 13:44:01 +02:00
Benoît Burnichon
7aa499716b Add Caption Service and Repositories 2016-05-19 13:44:01 +02:00
Jean-Yves Gaulier
10e4a7a961 PHRAS-1101_BACKPORT-4.0 
- fix : some elements of "train" don't display preview/caption when selected (due to code exception)
 2016-05-17 20:23:20 +02:00
Jean-Yves Gaulier
083f1941b0 PHRAS-1101_THMB-TRAIN-IN-PREVIEW 
- fix : some elements of "train" don't display preview/caption when selected (due to code exception)
 2016-05-17 20:19:17 +02:00
Benoît Burnichon
b61a8a7418 Fixup calls order to avoid N+1 2016-05-12 16:07:09 +02:00
Benoît Burnichon
ae4d46216f Add Caption Service and Repositories 2016-05-12 16:07:09 +02:00
Thibaud Fabre
c7b1b6b78d Merge pull request #1830 from aztech-dev/feature/order-webhooks 
Add webhook notifications for order events
 2016-05-12 14:59:59 +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
Thibaud Fabre
2e815bc463 Add SQL migration for new order column and fix docblocks 2016-05-11 16:59:36 +02:00
Benoît Burnichon
3ca525fee5 Merge branch '4.0' into merge-4.0 2016-04-22 19:44:05 +02:00
Benoît Burnichon
fca3146f91 Remove subdef etag when marking physically unavailable 2016-04-22 17:07:18 +02:00
Benoît Burnichon
f84f625a4e All media_subdef updates go to the repository 2016-04-22 16:15:37 +02:00
Benoît Burnichon
2b097e9be7 Extract SubdefGroup class 2016-04-22 12:38:33 +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
1274e0f7b3 Fixups issues in reduce calls. 2016-04-12 12:11:14 +02:00
Benoît Burnichon
e33781b62c Refactor media_Permalink_Adapter to be able to fetch more than one at a time 2016-04-12 12:11:14 +02:00