hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,668 Commits 268 Branches 107 Tags
60474d618c24706f1c6822c154ed1c90b718e7f5
Commit Graph

155 Commits

Author SHA1 Message Date
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
Nicolas Le Goff
b341495c88 Fix tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
ed4ae71819 Fix test suite 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
28fa23ea08 Add doctrine migrations 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
26bd977d5f Delete references to usr.usr_id field in entities 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/conf.d/migrations.yml

Conflicts:
	lib/Alchemy/Phrasea/ACL/BasketACL.php
	lib/Alchemy/Phrasea/Authentication/Authenticator.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Model/Entities/Basket.php
	lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
	lib/Alchemy/Phrasea/Model/Entities/Feed.php
	lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
	lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
	lib/Alchemy/Phrasea/Model/Entities/Session.php
	lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
	lib/Alchemy/Phrasea/Model/Entities/UsrList.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
	lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
	lib/classes/API/V1/adapter.php
	templates/mobile/lightbox/sc_note.html.twig
	templates/web/admin/connected-users.html.twig
	templates/web/admin/publications/fiche.html.twig
	templates/web/lightbox/IE6/agreement_box.html.twig
	templates/web/lightbox/agreement_box.html.twig
	templates/web/lightbox/basket_content_report.html.twig
	templates/web/lightbox/sc_note.html.twig
	templates/web/prod/WorkZone/Browser/Basket.html.twig
	templates/web/prod/WorkZone/Browser/Results.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Feedback/List-Share.html.twig
	templates/web/prod/actions/Feedback/ListsMacros.html.twig
	templates/web/prod/orders/order_box.html.twig
	templates/web/prod/orders/order_item.html.twig
	templates/web/prod/upload/lazaret.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Romain Neutron
5e5ac7f64f Fix patch 2014-02-19 11:33:42 +01:00
Romain Neutron
cec863ff7b Add check on libevent for production 2014-02-15 11:38:50 +01:00
Nicolas Le Goff
6ba5ce6669 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig
 2014-01-24 18:52:14 +01:00
Romain Neutron
59b43428e1 Fix migration to version 3.8 2014-01-23 11:29:53 +01:00
Romain Neutron
9c838e71e5 Remove dependency on gettext extension 2014-01-23 08:25:49 +01:00
Romain Neutron
2cc79fc439 Merge branch '3.8' 2014-01-23 08:25:10 +01:00