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

2198 Commits

Author SHA1 Message Date
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
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
Nicolas Le Goff
4318b0e0b5 Fix patch migration 2014-09-30 16:58:35 +02:00
Nicolas Le Goff
a6c411f404 Fix sql to get created client apps 2014-09-30 16:15:45 +02:00
Nicolas Le Goff
75334ad2bf PHRAS-295 #fix unmount databse cache 2014-09-25 15:45:22 +02:00
Nicolas Le Goff
a7b59b84c7 Merge pull request #1091 from nlegoff/yeah-yeah-yeah 
[3.8.6][PHRAS-136] Add static file mode to serve thumbnails
 2014-09-24 14:07:06 +02:00
Jean-Yves Gaulier
4f1faac99b fix PHRAS-293 #time 2h 2014-09-22 19:00:23 +02:00
Jean-Yves Gaulier
c962af8962 PHRAS-5 #time 1h 
prevent editing to clear the "make_subdef" jeton
 2014-09-17 12:26:37 +02:00
Jean-Yves Gaulier
6ce84ecc1c PHRAS-5 #time 1h 
prevent editing to clear the "make_subdef" jeton
 2014-09-17 12:23:45 +02:00
Nicolas Le Goff
5994dba2dc Check if application exists 2014-09-10 20:40:32 +02:00
Nicolas Le Goff
0aa1ff2e22 Minor fixes 2014-09-10 18:57:35 +02:00
Nicolas Le Goff
b192d46626 Generate xml file when installing or updgrading application 2014-09-10 18:57:31 +02:00
Nicolas Le Goff
f047878f36 bump to version 3.8.6-alpha3a 2014-09-10 11:29:08 +02:00
Nicolas Le Goff
9ba9533925 Fix github comments 2014-09-10 11:25:31 +02:00
Nicolas Le Goff
f27b960eeb Remove links when unmounting db 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
4dcd0b85fb Add patch 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
2c6ba6b99f Add static file mode to deliver thumbnails 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
2ad315cfb2 Set User_Query object as a service 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
98cf87557b Bump to version 390-alpha20 2014-09-09 21:21:38 +02:00
Romain Neutron
c4bf6c3c67 Convert custom events to symfony events 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
ab73febefd Fix users right 2014-09-09 20:05:57 +02:00
Nicolas Le Goff
7eb1a506fa Merge branch '3.8' 
Conflicts:
	.gitignore
	.travis.yml
	Vagrantfile
	lib/Alchemy/Phrasea/Controller/Datafiles.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/classes/connection/pdo.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.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/setup/step2.html.twig
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt
 2014-09-09 15:05:13 +02:00
Jean-Yves Gaulier
4441eae4a5 PHRAS-64 #time 1h 
fix "subdefs to be done" in admin/base
 2014-09-09 11:23:23 +02:00
Jean-Yves Gaulier
752f0d5da4 PHRAS-64 #time 1h 
show progression number (records to do) for subdef task
 2014-09-09 11:23:23 +02:00
Nicolas Le Goff
b2cfc55af8 Merge pull request #1155 from nlegoff/rebased-PHRAS-270 
[3.8][PHRAS-270] Fix metadata rewriting
 2014-09-09 11:22:10 +02:00
Jean-Yves Gaulier
b05fb498da PHRAS-270 #time 3h 
erase blank fields when writing metadatas = write back every field of the STRUCTURE, not only fields of the record.
 2014-09-08 23:59:43 +02:00
Jean-Yves Gaulier
9cef4528db PHRAS-270 #time 6h 
nb: exiftool MUST be updated - issue opened
 2014-09-08 23:59:43 +02:00
Nicolas Le Goff
9c4e098bb6 PHRAS-272 #fix database connection if no database provided 2014-09-08 23:37:30 +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
Nicolas Le Goff
f2d0533b01 Fix patch migration 2014-09-02 18:17:00 +02:00
Jean-Yves Gaulier
2bffbc77b5 fix bug in firefox 2014-08-28 11:50:12 +02:00
Nicolas Le Goff
232046605d Fix tests 2014-08-26 16:45:14 +02:00
Nicolas Le Goff
6f66f1de19 Add reconnectable statement 2014-08-26 16:42:56 +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
Jean-Yves Gaulier
426f71f935 PHRAS-65 #time 1j 
création des subdefs par base/type
 2014-08-26 11:45:43 +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
eddbc39a05 PHRAS-64 #time 1h 
patch changed to structure
 2014-08-20 16:09:22 +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
42b019b857 PHRAS-64 #time 1h 
add patch for appbox.task2
 2014-08-20 14:06:18 +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
c6da3855c7 Merge pull request #1095 from jygaulier/fix-phras-141 
[3.8.6][PHRAS-141] Delete action is not taken into account for tasks
 2014-08-19 16:43:26 +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