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
9,700 Commits 268 Branches 107 Tags
7f97445b51f32446cb8befe01db66df6aac635c7
Commit Graph

2444 Commits

Author SHA1 Message Date
Nicolas Le Goff
b83bce0254 Fix flickr 2014-12-15 15:33:29 +01:00
Nicolas Le Goff
088b0672cb Fix latest merge 2014-12-15 11:40:30 +01:00
Nicolas Le Goff
edac914c8f Fix missing argument in rename_all_metadata function 2014-12-12 16:58:07 +01:00
Nicolas Le Goff
086669a39e Fix latest merge 2014-12-12 15:16:49 +01:00
Nicolas Le Goff
0c18434eb4 Fix latest merge 2014-12-10 17:31:07 +01:00
Nicolas Le Goff
d4792cd473 Fix sql downloads 2014-12-09 14:36:28 +01:00
Nicolas Le Goff
589169299c Fix merge 3.8 2014-12-09 14:01:00 +01:00
Nicolas Le Goff
9f38823f27 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
 2014-12-09 13:59:29 +01:00
Nicolas Le Goff
7ea5cdf834 Fix download 2014-12-05 16:07:45 +01:00
Nicolas Le Goff
552bb88d4e Add exif method to record interface 2014-12-04 11:48:12 +01:00
Nicolas Le Goff
93d3e98e88 Fix record preview minor issue 2014-12-04 11:48:11 +01:00
Nicolas Le Goff
9509c3653f Fix missing return 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
b7c428f71f Fix minor issues 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
15a03f647d Update according to @mdarse comments 2014-12-04 11:48:09 +01:00
Nicolas Le Goff
1dddcbd3c6 Handle substitution 2014-12-04 11:48:09 +01:00
Nicolas Le Goff
392ff21d51 Clean 2014-12-04 11:48:08 +01:00
Nicolas Le Goff
419509de68 Remove the use of old record_interface interface 2014-12-04 11:48:08 +01:00
Nicolas Le Goff
0659ad4c50 Add use statement for RecordInterface 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
b21eae91d1 Remove old record adapter interface 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
6f70159e35 Record Adapter now implements new RecordAdapter Interface 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
c7a387e6e8 ACL classe now use RecordInterface 2014-12-04 11:48:06 +01:00
Nicolas Le Goff
c4965f4598 fix report download 2014-12-02 17:40:59 +01:00
Nicolas Le Goff
616337db33 Fix dump calculation 2014-11-26 00:19:18 +01:00
Nicolas Le Goff
d5531ce8b2 Fix Migration 2014-11-24 17:03:28 +01:00
Nicolas Le Goff
4b5a1d79fb Fix etags calculation 2014-11-21 14:55:10 +01:00
Nicolas Le Goff
68af5b3391 Returns 304 http code if images are not modified 2014-11-21 10:36:52 +01:00
Nicolas Le Goff
31938f23c7 Get logs from deleted records as well 2014-11-21 09:24:44 +01:00
Nicolas Le Goff
e2267d4f1c Fix download report 2014-11-21 09:20:42 +01:00
Nicolas Le Goff
af78aae182 PHRAS-335 #fix dashboard & downloads query 2014-11-19 17:40:02 +01:00
Nicolas Le Goff
2000f4116f Fix tests 2014-11-19 14:50:08 +01:00
Nicolas Le Goff
7d44a356e3 CUS-120 #fix editon date for records 2014-11-18 17:47:33 +01:00
Nicolas Le Goff
52b9850add Fix tests 2014-11-18 14:36:50 +01:00
Nicolas Le Goff
13759a6c86 PHRAS-289 #fix action are for push and validation are inverted 2014-11-17 16:52:26 +01:00
Nicolas Le Goff
6a8b79be45 PHRAS-335 #fix date mismatching in report 2014-11-17 16:50:20 +01:00
Nicolas Le Goff
d47df2418b PHRAS-335 #fix date mismatching 2014-11-17 12:09:01 +01:00
Nicolas Le Goff
0b763c459e PHRAS-342 #fix remove usr list when user is deleted 2014-11-17 11:46:28 +01:00
Nicolas Le Goff
2c59cdd3dd Merge pull request #1182 from jygaulier/REPORT-VU 
Report-VU : fix collection selection, date selectors, csv, ...
 2014-11-07 12:10:02 +01:00
Nicolas Le Goff
d7b8a67ac3 Remove references to collection filter 2014-11-05 12:57:48 +01:00
Jean-Yves Gaulier
a353dc4de6 Report-VU : fix tests 2014-11-03 12:24:38 +01:00
Jean-Yves Gaulier
6a1e161701 Report-VU : fix collection selection, date selectors, csv, ... 
disabled log
 2014-10-30 18:54:06 +01:00
Nicolas Le Goff
3f26c2161d Fix status bit offset 2014-10-29 16:55:33 +01:00
Nicolas Le Goff
f695f4ec37 Force free memory 2014-10-20 10:06:04 +02:00
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +02:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Nicolas Le Goff
28eecf6a09 Merge branch '3.8' 
Conflicts:
	.gitignore
	bin/console
	composer.json
	composer.lock
	hudson/fixtures.sql
	lib/Alchemy/Phrasea/Command/Developer/IniReset.php
	lib/Alchemy/Phrasea/Command/Setup/Install.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Setup/Upgrade.php
	lib/classes/media/subdef.php
	lib/classes/task/period/RecordMover.php
	templates/web/prod/index.html.twig
	templates/web/setup/step2.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/db-ref.sqlite
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
 2014-10-09 19:40:33 +02:00
Nicolas Le Goff
130591e372 Merge pull request #1173 from nlegoff/api-version 
[3.8.6] Update API version
 2014-10-09 16:58:28 +02:00
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-10-06 18:24:58 +02:00
Jean-Yves Gaulier
90e611de81 fix PHRAS-306 #time 6h 
NB: can be set now, but will work only when PHPExiftool will be patched with the "copy" method (PR done).
 2014-10-01 19:52:17 +02:00
Nicolas Le Goff
68fc8f660e Update API version 2014-10-01 12:37:30 +02:00
Nicolas Le Goff
6087ee3fb4 Merge pull request #1172 from nlegoff/fix-patch 
[3.8] Fix patch migration && advanced search issues
 2014-10-01 11:45:05 +02:00