hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,691 Commits 268 Branches 107 Tags
dd480b0db02484c314f27c0aeb554f10ab8ac18f
Commit Graph

406 Commits

Author SHA1 Message Date
Thibaud Fabre
dd480b0db0 Start integration of worker bundle 2016-10-10 11:19:43 +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
3d8d4f6d99 Fix config editor set command 2016-09-27 11:11:02 +02:00
Thibaud Fabre
8b843b9357 Add configuration editor command in setup 2016-09-27 07:49:06 +02:00
Thibaud Fabre
1917b3dba3 Merge branch 4.0 into master 2016-05-25 17:21:08 +02:00
Thibaud Fabre
95bb3eedeb Fix duplicate log entries in webhook job 2016-05-18 13:07:28 +02:00
Gilles MATEU
bb17d26fa8 spelling error in Configuration.php 
"Confguration compiled." instead of "Configuration compiled."
 2016-05-01 17:55: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
7a25b499e3 Deprecated set_binary_status and use setStatus instead. 2016-04-13 18:50:39 +02:00
Jean-Yves Gaulier
bc7fa44cf1 PHRAS-1055 #time 15m 
- fix fatal error "getName()"
 2016-04-06 16:46:54 +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
6cb9e8b80b PHRAS-1055 #time 1m 
- fix vocabulary (flag)
 2016-04-04 14:44:39 +02:00
Jean-Yves Gaulier
05b2c876ef PHRAS-1055 #time 2h 
- cleanup
- add option "--reset_subdef_flag"
- add option "--set_writemeta_flag"
 2016-04-04 14:41:20 +02:00
Jean-Yves Gaulier
0f40eb5861 PHRAS-1055 #time 1m 
- cleanup
 2016-04-04 14:41:20 +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
Jean-Yves Gaulier
81b636d4de 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"
 2016-04-04 14:41:19 +02:00
Jean-Yves Gaulier
95683735b6 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
 2016-04-04 14:41:19 +02:00
Jean-Yves Gaulier
fe6bb51351 PHRAS-1055 #time 1h 
- no bug concerning --max_record
- add try/catch so the job don't stop on errors
 2016-04-04 14:41:19 +02:00
Benoît Burnichon
11abedd0ed Convert some SQL to HEREDOCS 2016-03-29 15:28:42 +02:00
Benoît Burnichon
e10e83dd36 Fix issue with improper count SQL 2016-03-29 15:28:19 +02:00
Benoît Burnichon
421e62d136 Typos in Users in RegenerateSqliteDb command. 
PHPCS of tests
 2016-03-22 16:09:38 +01:00
Benoît Burnichon
03b821acb7 Merge branch '4.0' 2016-03-16 17:21:57 +01:00
Benoît Burnichon
03e0dbae52 reduce duplication and refactor BuildSubdefs Command 2016-03-15 12:24:58 +01:00
Benoît Burnichon
c789c58f93 Refactor BuildMissingSubdefs 2016-03-15 12:24:58 +01:00
Benoît Burnichon
6cda4eec7e Merge branch '4.0' 2016-03-11 21:50:23 +01:00
Scrutinizer Auto-Fixer
d8d4d79309 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-03-11 16:13:39 +00:00
Benoît Burnichon
97685ebab1 Merge remote-tracking branch 'upstream/4.0' 2016-03-11 15:06:50 +01:00
Benoît Burnichon
c440486603 Refactor Task Manager related commands. 2016-03-10 15:35:16 +01:00
Jean-Yves Gaulier
2af8b3d954 change "ticks" to 1000 
todo : fix vendor(s)...
#PHRAS-997 time 5m
 2016-03-10 14:23:17 +01:00
Benoît Burnichon
6cdc9d7a31 Remove some deprecated methods calls 2016-03-06 23:05:55 +01:00
jygaulier
1ab785dab1 Merge branch 'master' into PHRAS-997_Ticks 2016-03-03 17:40:41 +01:00
Jean-Yves Gaulier
b8f2b8b012 change "ticks" to 1000 
todo : fix vendor(s)...
#PHRAS-997 time 5m
 2016-03-03 17:38:38 +01:00
Benoît Burnichon
91424b2883 Typos in Users in RegenerateSqliteDb command. 
PHPCS of tests
 2016-03-02 14:34:50 +01:00
Benoît Burnichon
070917fd9d Simplify Uninstaller process. 2016-02-05 17:09:54 +01:00
Benoît Burnichon
0ef9b668c2 Remove use of gettext shortcut method. 2016-02-01 14:03:29 +01:00
Benoît Burnichon
f2942dac89 Reduce duplication in H264MappingGenerator 2016-01-22 12:23:18 +01:00
Thibaud Fabre
c92d5da9fe Merge branch 'clean-boxes' into merge-clean-boxes 2016-01-06 19:53:43 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
b2ee2668a1 Change to be able to return called API version 2015-12-22 14:19:34 +01:00
Benoît Burnichon
2e1ad08383 Fixup build-missing-subdef command. 
PHRAS-855
 2015-12-03 15:00:44 +01:00
Florian BLOUET
261339ecd5 remove recess, bower, grunt and uglifyJs dependencies in php utils and tests 
updated minifier tests
 2015-12-02 17:36:37 +01:00
Benoît Burnichon
560ed7be27 Add options to TranslationDumper command 2015-11-19 12:45:07 +01:00
Benoît Burnichon
8e27a1b1c0 Update HelpMessageExtractor 2015-11-04 16:31:06 +01:00
Benoît Burnichon
8aca5f6126 Use Uuid with its new namespace 2015-10-27 20:14:01 +01:00
Jean-Yves Gaulier
12912a309a PHRAS-374 #time 3h 
fix : console build-subdefs can build non existing subdefs, ex. after adding a new subdef name in admin.
 2015-09-02 13:49:31 +02:00
Thibaud Fabre
ea6a4fdbf0 Extract repository and factory classes for collections 2015-07-09 12:32:06 +02:00
Benoît Burnichon
f920e8354a Replace phraseanet.appbox by getApplicationBox() method calls. 2015-07-02 12:33:19 +02:00
Benoît Burnichon
d645b92afa Add AclAware Trait 2015-07-02 12:33:18 +02:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
 2015-07-02 12:33:18 +02:00
Benoît Burnichon
6e651f3b07 Replace app['phraseanet.appbox']->get_databox using trait 2015-07-02 12:27:26 +02:00