hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,392 Commits 268 Branches 107 Tags
32b6423cbeb8e87aa699f06049c20b87e67b3297
Commit Graph

2918 Commits

Author SHA1 Message Date
Nicolas Le Goff
9c4e098bb6 PHRAS-272 #fix database connection if no database provided 2014-09-08 23:37:30 +02:00
Nicolas Le Goff
2e6c11a9ed Update travis 2014-09-08 22:23:00 +02:00
Nicolas Le Goff
0e807b2b0f Add aggregable property to metadata fields 2014-09-08 14:53:23 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00
Nicolas Le Goff
fc2f49d012 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/record/adapter.php
	lib/classes/task/period/subdef.php
	templates/web/prod/thesaurus.js.twig
	tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/connectionTest.php
 2014-09-02 19:09:38 +02:00
Jean-Yves Gaulier
415ec0d7a0 speedup hit compute (green digits in prod/thesaurus) 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6e9c6d9480 clean 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
31401364f0 speedup occurences calc 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6fbe66829c phras-36 #time 4h 
first proto, wip do not merge
 2014-09-02 13:44:36 +02:00
Nicolas Le Goff
e553690166 Merge pull request #1136 from nlegoff/fix-114 
[3.8.6][PHRAS-114] Add candidate in thesaurus
 2014-09-01 11:07:22 +02:00
Nicolas Le Goff
ce6bc3d5e1 Fix minor issues 2014-08-29 18:07:48 +02:00
Nicolas Le Goff
d2ff7b8c26 PHRAS-114 #fix Add candidate in thesaurus 2014-08-26 17:23:32 +02:00
Nicolas Le Goff
232046605d Fix tests 2014-08-26 16:45:14 +02:00
Nicolas Le Goff
b9bb9f5f0e Merge branch '3.8' 
Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig
 2014-08-26 13:38:01 +02:00
Nicolas Le Goff
d44eea20a6 Merge pull request #1105 from nlegoff/crossdomain 
[READY][3.8.6][PHRAS-25] Crossdomain command generator
 2014-08-22 18:52:40 +02:00
Jean-Yves Gaulier
b34555d4a1 PHRAS-64 #time 1h 
fix version back
 2014-08-20 16:11:22 +02:00
Nicolas Le Goff
6485b64e68 Fix latest merge 2014-08-20 15:13:41 +02:00
Jean-Yves Gaulier
2274e4ebc9 PHRAS-64 #time 1h 
add patch for appbox.task2
 2014-08-20 14:15:25 +02:00
Jean-Yves Gaulier
33b8451978 PHRAS-64 #time 1,5j 
delete progress bars for tasks / add subdefs stats for base
 2014-08-20 14:06:18 +02:00
Nicolas Le Goff
7814ae42d1 Fix latest merge 2014-08-19 17:22:48 +02:00
Nicolas Le Goff
9494738c12 Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/RecordMover.php
 2014-08-19 17:20:31 +02:00
Nicolas Le Goff
64a2201d08 Merge pull request #1112 from jygaulier/fix-PHRAS-164 
[3.8.6][PHRAS-164] Allow sorting on 'number' fields
 2014-08-19 16:50:18 +02:00
Nicolas Le Goff
f6f2dbc22d Add crossdomain parser 2014-08-19 16:35:57 +02:00
Nicolas Le Goff
bc88d0f474 Add crossdomain file generator command 2014-08-19 16:35:57 +02:00
Nicolas Le Goff
46da7be65d Merge branch '3.8' 
Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
 2014-08-19 15:30:25 +02:00
Nicolas Le Goff
6ee8d2bab3 Merge pull request #1121 from nlegoff/ini-command 
[READY][3.8.6] Add developer command to reset environment
 2014-08-19 15:10:59 +02:00
Nicolas Le Goff
cbd0bb0558 Fix install 2014-08-19 15:00:36 +02:00
Nicolas Le Goff
353d625f9a Fix latest merge 2014-08-19 14:59:48 +02:00
Nicolas Le Goff
81763db182 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Helper/Record/Helper.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/caption/record.php
	lib/classes/registry.php
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
 2014-08-19 12:17:18 +02:00
Nicolas Le Goff
bef7fa836e Merge pull request #1130 from nlegoff/right-apis 
[READY][3.8.6] Apply user rights on sub-definition
 2014-08-19 11:50:11 +02:00
Nicolas Le Goff
8a55a2c1ed Fix latest merge 2014-08-19 11:49:35 +02:00
Nicolas Le Goff
779c29dd16 Allow to rotate thumbnails on all type of records 2014-08-19 11:45:19 +02:00
Nicolas Le Goff
2328bc772d Fix PDF generation for print 2014-08-19 11:43:16 +02:00
Nicolas Le Goff
33d6a34f26 Fix PHRAS-146 Order of a basket generates an error when the content comes from two different collections 2014-08-19 11:41:11 +02:00
Nicolas Le Goff
2d0a2bc353 Merge pull request #1100 from nlegoff/fix-146 
[READY][3.8.6][PHRAS-146] Order of a basket generates an error when the content come...
 2014-08-18 10:50:36 +02:00
Nicolas Le Goff
ab80bd454b Merge pull request #1107 from nlegoff/fix-phras-111 
[READY][3.8.6][PHRAS-111] Allow rotation for image subdef
 2014-08-18 10:50:09 +02:00
Nicolas Le Goff
095371fa05 Merge pull request #1110 from nlegoff/fix-phras-153 
[READY][3.8.6][PHRAS-153] Fix printing PDF generation
 2014-08-18 10:48:49 +02:00
Nicolas Le Goff
fe6bdb21b2 Allow to rotate thumbnails on all type of records 2014-08-13 18:23:40 +02:00
Nicolas Le Goff
9e2083dfe4 Add init command 2014-08-13 18:21:57 +02:00
Nicolas Le Goff
8196c2720e Fix tests 2014-08-13 18:06:54 +02:00
Nicolas Le Goff
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00
Nicolas Le Goff
2899f152fb Merge branch '3.8' into fix-latest-merge 
Conflicts:
	README.md
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/result.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskrun.php
	lib/classes/set/export.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/configuration.yml
	templates/web/admin/setup.html.twig
	templates/web/admin/tasks/list.html.twig
	templates/web/api/auth/end_user_authorization.html.twig
	templates/web/prod/actions/Feedback/list.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/upload/upload.html.twig
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/api/v1/api_v1_resultTest.php
 2014-08-11 20:28:03 +02:00
Nicolas Le Goff
80a3366294 Fix api content type 2014-08-07 14:52:59 +02:00
Nicolas Le Goff
8994232022 Fix elastic search index 2014-08-07 11:40:17 +02:00
Nicolas Le Goff
f2e18d7d54 Merge pull request #1128 from nlegoff/content-type 
[3.8.6] Add missing html content type for content negotiation
 2014-08-04 11:19:04 +02:00
Nicolas Le Goff
981db36482 PHRAS-227 #fix watermark presentation mode for permalink 2014-08-01 18:54:54 +02:00
Nicolas Le Goff
0ecd3a0c12 Add missing html content type 2014-08-01 16:46:50 +02:00
Nicolas Le Goff
e640f72c33 Merge pull request #1101 from nlegoff/api-extend 
[3.8.6][PHRAS-32] Add extended format option for records API responses
 2014-07-30 19:33:51 +02:00
Nicolas Le Goff
190ccd7e3e PHRAS-198 fix 2014-07-30 18:49:50 +02:00
Nicolas Le Goff
4d7a58bcf4 Add tests 2014-07-30 16:47:50 +02:00