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

166 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
5c7b4ac484 Improve in:reset command 2014-09-10 18:57:27 +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
232046605d Fix tests 2014-08-26 16:45:14 +02:00
Nicolas Le Goff
b7549ad1c5 Fix migration 2014-06-24 01:03:51 +02:00
Nicolas Le Goff
f327d5a459 Update migration 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
2e1a505774 Create phraseanet oauth application when installation is done 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
bf5b02a583 Sets api tokens fields length to 128 for migration purpose 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
5145848161 Add Migration patch 2014-03-24 12:28:47 +01:00
Nicolas Le Goff
e317f86c51 Fix CS 2014-03-23 23:07:01 +01:00
Nicolas Le Goff
1516ae5d3a Remove alteratiion of AggregateToken 2014-03-14 11:37:11 +01:00
Nicolas Le Goff
5d69033285 Fix Users Migration in case of failure 2014-03-14 11:37:11 +01:00
Nicolas Le Goff
ac1485f99c Add Aggregate Token Migration 2014-03-14 11:37:11 +01:00
Nicolas Le Goff
52e350d968 Add Preset Migration 2014-03-14 11:37:11 +01:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +01:00
Nicolas Le Goff
6c3cdfc52e Merge pull request #1006 from romainneutron/fix-connection-master 
[Ready][3.9] Add reconnectable connection
 2014-03-04 11:19:44 +01:00
Romain Neutron
c724465d79 Make doctrine migration up and down method final 2014-03-03 14:21:14 +01:00
Romain Neutron
8cf73891c0 Add reconnectable connection 2014-03-03 01:00:15 +01:00
Romain Neutron
92a4c35340 Substitute random string generator by Randomlib 2014-03-02 21:13:57 +01:00
Romain Neutron
ed8f98432d Merge branch '3.8' 2014-02-28 19:51:08 +01:00
Romain Neutron
170c145e15 Merge pull request #1003 from nlegoff/fix-bin-detec 
[3.8] Fix binary version detection on debian system
 2014-02-28 19:50:27 +01:00
Nicolas Le Goff
2fcf8beec3 Fix unoconv version detection on debian system 2014-02-28 19:26:25 +01:00
Nicolas Le Goff
f593431463 Fix tests using GPAC on debian system 2014-02-28 19:25:26 +01:00
Romain Neutron
9a2875f46b Fix registration table name 2014-02-27 16:57:31 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
52f3baac05 Fix neutron's comment 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Romain Neutron
3e1e115292 Merge pull request #973 from nlegoff/fix-tests-debian 
[3.9] Fix tests using GPAC on debian system
 2014-02-25 18:24:28 +01:00
Romain Neutron
d27792a942 Merge pull request #972 from nlegoff/upgrade-fix 
[3.9] Fix table detection
 2014-02-25 16:35:03 +01:00
Nicolas Le Goff
4a242a120e Fix tests using GPAC on debian system 2014-02-25 16:02:32 +01:00
Nicolas Le Goff
c100f0bfe4 Fix table detection 2014-02-25 15:38:01 +01:00
Nicolas Le Goff
4535491e6c Merge pull request #965 from romainneutron/host-configuration 
[3.9] Add configuration per host
 2014-02-24 12:30:26 +01:00
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
e20c915775 Avoid using getPartialReference 2014-02-20 16:14:01 +01:00
Romain Neutron
7ef147c975 Address comments 2014-02-20 16:09:18 +01:00
Romain Neutron
4153fa900a Move FTP setting upgrade to Users upgrade 2014-02-20 11:17:41 +01:00
Nicolas Le Goff
0cb75cdf95 Update upgrade 39 2014-02-19 20:31:42 +01:00
Nicolas Le Goff
ba464ad497 Fix CS 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
7fb44d2b43 Fix merge 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
ffc0efdb57 Fix doctrine migrations 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
efd69c6de8 CS fixer 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
65e6b44671 Enhance User migration 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
7c0d1e3d8d Fix user migration 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
2973513519 Fix user migration 2014-02-19 17:29:26 +01:00
Andrey
ada3ec96c3 Add Doctrine schema pre-upgrades 
Conflicts:
	lib/classes/appbox.php
 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
c10c78f740 Fix unit tests 2014-02-19 17:29:26 +01:00