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

12001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
722fffee39 Merge pull request #1966 from xrousset78800/fix/add-subdef-rotation-wording 
Rollback and change subdef rotation wording
 2016-09-29 14:07:20 +02:00
Xavier Rousset
b17c244c8f PHRAS-1224 Change subdef rotation wording 2016-09-29 13:44:45 +02:00
Thibaud Fabre
5361906447 Merge pull request #1961 from alchemy-fr/feature/user-delete-webhook 
PHRAS-1239 Add webhook for user deleted events
 2016-09-29 10:44:14 +02:00
Thibaud Fabre
bd7e0987bc Clear log repository on user deletion 2016-09-29 10:22:05 +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
e11cd249af Merge pull request #1965 from alchemy-fr/fix/lock-file 
Allow PHP7 build failures
 2016-09-29 09:26:12 +02:00
Thibaud Fabre
07f7674755 Allow PHP7 failures in build 2016-09-29 09:04:42 +02:00
Thibaud Fabre
997a6bcc31 Update dependencies with PHP 5.5.x to fix build issues 2016-09-29 08:52:38 +02:00
Thibaud Fabre
8f99a69add Fix spaces in Makefile 2016-09-28 21:46:23 +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
2ec2df659f Merge pull request #1951 from alchemy-fr/feature/disable-api 
PHRAS-1212 Add option to disable API via configuration setting
 2016-09-28 21:11:32 +02:00
Thibaud Fabre
2648deec2e Merge pull request #1962 from alchemy-fr/fix/deleted-gitkeeps 
PHRAS-1245 Preserve gitkeep file
 2016-09-28 21:04:07 +02:00
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Thibaud Fabre
7cf5d28a99 Fix configuration setting access 2016-09-28 20:25:25 +02:00
Thibaud Fabre
5666286e33 Fix typo in api_disable param name 2016-09-28 20:25:25 +02:00
Thibaud Fabre
c13e086120 Add option to disable API via configuration setting 2016-09-28 20:25:25 +02:00
Thibaud Fabre
e562642973 Merge pull request #1963 from alchemy-fr/merge/4.0 
PHRAS-1248 Merge 4.0 into master
 2016-09-28 20:23:59 +02:00
Thibaud Fabre
891db517e4 Fix PHPUnit version requirement for PHP 5.5.9 2016-09-28 20:03:33 +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
Thibaud Fabre
9c4b3b7429 PHRAS-1245 Preserve gitkeep file 2016-09-28 18:40: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
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
Thibaud Fabre
154c2616a7 Merge pull request #1958 from xrousset78800/fix/incorrect-english-translation-in-setup 
Change wording on setup template
 2016-09-27 13:32:56 +02:00
Xavier Rousset
0b16fd577e PHRAS-1234 Change wording on setup template 2016-09-27 12:24:03 +02:00
Thibaud Fabre
675ec2c939 Merge pull request #1957 from alchemy-fr/fix/provisioned-api-settings 
API settings provisioning
 2016-09-27 11:27:13 +02:00
Thibaud Fabre
7d22a716f5 Merge pull request #1956 from alchemy-fr/feature/collection-order-manager 
PHRAS-1006 Add order manager in API collection description
 2016-09-27 11:11:43 +02:00
Thibaud Fabre
87a9f532c8 Set extra API settings during provisioning 2016-09-27 11:11:25 +02:00
Thibaud Fabre
3d8d4f6d99 Fix config editor set command 2016-09-27 11:11:02 +02:00
Thibaud Fabre
ebc515f2c1 PHRAS-1006 Add order manager in API collection description 2016-09-27 10:38:34 +02:00
Thibaud Fabre
36a0f819fc Merge pull request #1955 from alchemy-fr/fix/vagrant-debug-mode 
Allow debugger access to Vagrant host IP addresses
 2016-09-27 10:17:18 +02:00
Thibaud Fabre
b18fa2d228 PHRAS-1214 Allow debugger access to Vagrant host IP addresses 2016-09-27 10:08:42 +02:00
Thibaud Fabre
758938ca09 Merge pull request #1954 from alchemy-fr/feature/edit-config-command 
Add configuration editor command in setup
 2016-09-27 07:55:50 +02:00
Thibaud Fabre
8b843b9357 Add configuration editor command in setup 2016-09-27 07:49:06 +02:00
Thibaud Fabre
a2b7c949fb Merge pull request #1953 from alchemy-fr/feature/improve-makefile 
Split build into smaller targets
 2016-09-27 06:30:11 +02:00
Thibaud Fabre
86d4dfc8fc Split build into smaller targets 2016-09-27 06:29:16 +02:00
Thibaud Fabre
1fcaa10f7a Merge pull request #1952 from alchemy-fr/fix/provisioning-4.0 
Fix provisioning errors
 2016-09-27 06:23:08 +02:00
Thibaud Fabre
cbe8789060 Do not install plugins as unprivileged user 2016-09-27 06:15:14 +02:00
Thibaud Fabre
8463b81752 Fix Gulp build command 2016-09-27 06:15:03 +02:00
Thibaud Fabre
826845f65b Merge pull request #1950 from xrousset78800/fix/change-caret-color-on-white-skin 
Change caret color on phraseanet white skin
 2016-09-26 17:33:23 +02:00
Xavier Rousset
06a0b89c48 PHRAS-1196 Change caret color on phraseanet white skin 2016-09-26 16:13:46 +02:00
Thibaud Fabre
3ddcc0202c Merge pull request #1949 from xrousset78800/fix/remove-rotation-subdef-wording-on-4.0 
Remove unwanted rotation wording
 2016-09-26 15:07:49 +02:00
Xavier Rousset
c98b40ef2f PHRAS-1224 Remove unwanted rotation wording 2016-09-26 14:44:44 +02:00
Thibaud Fabre
986a517ecf Merge pull request #1947 from alchemy-fr/fix/phras-1210 
PHRAS-1210 Remove invalid assignment
 2016-09-22 18:33:50 +02:00
Thibaud Fabre
051eb0a2bf PHRAS-1210 Remove invalid assignment 2016-09-22 18:11:24 +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