hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,452 Commits 268 Branches 107 Tags
2df0f9d659d10064c20239b33280a059bee33cc6
Commit Graph

1992 Commits

Author SHA1 Message Date
Nicolas Le Goff
39ffdcd3b5 Regenerate proxie 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
0e1203f595 Some fix after rebase 2014-02-19 17:28:54 +01:00
Nicolas Le Goff
678f741660 Use Short Array notation 2014-02-19 17:28:54 +01:00
Nicolas Le Goff
54a5d6578c Replace getter and setter for user & user notif setting value 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
3322437648 Replace setters 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
2aba3e8d8d Merge pull request #957 from romainneutron/doctrine-namespace 
[3.9] Add a namespace to Phraseanet doctrine entities
 2014-02-19 11:37:09 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Romain Neutron
bdc93f0220 Remove some circular references 2014-02-17 12:25:18 +01:00
Romain Neutron
ffab51235a Address PR comments 2014-02-15 12:05:05 +01:00
Romain Neutron
2c642f594f Add patch to version 3.9.0-alpha.11 2014-02-15 11:38:51 +01:00
Romain Neutron
372fc86601 Use short array declarations 2014-02-11 18:44:31 +01:00
Romain Neutron
76048709ee Fix CS 2014-02-11 16:27:47 +01:00
Romain Neutron
de6959f59f Fix typo 2014-02-05 23:24:04 +01:00
Nicolas Le Goff
b3b4823214 Merge pull request #932 from romainneutron/task-manager-log-messages 
[3.8] Update task manager log messages
 2014-02-05 21:44:00 +01:00
Romain Neutron
25e72b4824 Update task manager log messages 2014-02-05 20:46:59 +01:00
Romain Neutron
088b1e0f5f Make log messages more understandable 2014-02-05 15:17:34 +01:00
Nicolas Le Goff
1456d92dbd Fix latest merge 2014-02-04 13:44:38 +01:00
Romain Neutron
21d57a375c Use task-manager loggers for scheduler 2014-02-04 12:10:56 +01:00
Nicolas Le Goff
4596bf5d30 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php
 2014-02-04 11:30:23 +01:00
Romain Neutron
eafb632557 Enhance exception message 2014-02-04 11:21:04 +01:00
Nicolas Le Goff
fbb1b46399 Merge pull request #914 from romainneutron/taskmanager-log-levels 
[3.8] Update task manager log levels
 2014-02-03 10:14:49 -08:00
Jean-Yves Gaulier
d6f911cf91 fix #1634 2014-02-03 19:08:31 +01:00
Nicolas Le Goff
bd1e4516bd Merge branch '3.8' 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
 2014-02-03 19:02:22 +01:00
Romain Neutron
5b0fdb21f6 Update task manager log levels 2014-02-03 15:04:31 +01:00
Romain Neutron
7e7350a0a7 Bump to version 3.8.3-alpha.5 2014-01-31 15:09:05 +01:00
Romain Neutron
f59fc65d13 Add task manager logs configuration 2014-01-31 15:05:57 +01:00
Romain Neutron
3945be00d4 Fix CS 2014-01-30 19:56:05 +01:00
Romain Neutron
3124d7634e Add option to dump SQL queries in stderr 2014-01-30 19:55:48 +01:00
Romain Neutron
3421700a59 Add option to dump SQL queries in stderr 2014-01-29 16:46:30 +01:00
Romain Neutron
62b68066e6 Fix use of wrong constant 2014-01-29 12:23:29 +01:00
Romain Neutron
97d96a6b32 Add elastic-search engine support 2014-01-27 20:12:13 +01:00
Romain Neutron
e840df0b36 Decouple caption and its serialization 2014-01-27 20:12:13 +01:00
Nicolas Le Goff
383ff77449 Merge branch '3.8' 
Conflicts:
	.travis.yml
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/databox.php
 2014-01-27 17:23:03 +01:00
Nicolas Le Goff
33447f7315 Merge pull request #883 from nlegoff/fix-1670 
[3.8] Fix #1670 API password grant type authentication is broken
 2014-01-27 08:00:32 -08:00
Nicolas Le Goff
b487b3d925 Merge pull request #896 from romainneutron/remove-truncate 
[3.8] Remove TRUNCATE in favor of DELETE FROM
 2014-01-27 08:00:11 -08:00
Romain Neutron
0538bd52cc Remove TRUNCATE in favor of DELETE FROM 2014-01-27 16:04:55 +01:00
Romain Neutron
d622eb0ab4 Fix task manager messages log levels 2014-01-23 11:31:21 +01:00
Nicolas Le Goff
a960150caa Fix #1670 API password grant type authentication is broken 2014-01-22 15:56:57 +01:00
Nicolas Le Goff
12996a2eef Fix merge 3.8 2014-01-20 15:24:28 +01:00
Nicolas Le Goff
15abccf594 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2014-01-20 11:08:36 +01:00
Nicolas Le Goff
f58a1ee544 Merge pull request #873 from nlegoff/fix-usr-field-encoding 
[3.8] Fix usr.usr_login field encoding
 2014-01-20 01:51:23 -08:00
Romain Neutron
91cf9705ab Add subdef substituer 2014-01-14 15:05:44 +01:00
Nicolas Le Goff
b4d5cfbf52 Merge pull request #874 from romainneutron/fix-cs 
Fix CS
 2014-01-14 05:58:58 -08:00
Nicolas Le Goff
c4648e30b1 Add 3.8.3alpha.4 patch 2014-01-14 13:02:23 +01:00
Nicolas Le Goff
45679d8675 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/classes/collection.php
	templates/web/admin/databox/databox.html.twig
 2014-01-14 12:38:58 +01:00
Romain Neutron
2da822f65d Fix copyright year 2014-01-14 12:05:34 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
f0486f9478 Fix #1646 : Unable to mount collections 2014-01-13 18:06:18 +01:00