hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,383 Commits 268 Branches 107 Tags
53cb47d0b7e1e31f21c20f97477d8f550c60d1bf
Commit Graph

7383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Le Goff
7b9106d298 Update patches 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
9bf5a29b44 Delete User_Adapter 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
926f6351c9 Update Entities 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
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
739866a2b4 Remove last ACL( 2014-02-19 17:28:54 +01:00
Nicolas Le Goff
002d949f6c Replace delete method 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
3b3e92575f Add setter for user setting 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
171390f7c8 Use short array notations 2014-02-19 17:28:39 +01:00
Nicolas Le Goff
604ded5333 Fix CS 2014-02-19 17:27:21 +01:00
Romain Neutron
4b5613cf9a Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	builder.php
	launchpadToLocales.php
	localesToLaunchPad.php
 2014-02-19 12:08:05 +01:00
Nicolas Le Goff
fab9a64ae0 Merge pull request #959 from romainneutron/cleanup-files 
[3.8] Cleanup files
 2014-02-19 11:37:56 +01:00
Romain Neutron
4893b62fc6 Fix #1697 : Add pagination to quarantine 2014-02-19 11:37:47 +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
64955df549 Remove old files 2014-02-19 11:36:25 +01:00
Romain Neutron
5e5ac7f64f Fix patch 2014-02-19 11:33:42 +01:00
Romain Neutron
a331d4e467 Format changelog 2014-02-19 03:12:30 +01:00
Romain Neutron
0f4ff45490 Format changelog 2014-02-19 03:11:20 +01:00
Romain Neutron
2bc6dcd388 Update changelog 2014-02-19 03:09:04 +01:00
Romain Neutron
4ffa37c384 Update changelog for 3.8.3 2014-02-19 03:07:04 +01:00
Romain Neutron
e574a1c988 Merge branch '3.8' 2014-02-18 19:49:16 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Romain Neutron
71f2c1969b Merge pull request #956 from romainneutron/php-5.6 
[3.8] Add travis build on PHP 5.6
 2014-02-17 19:22:27 +01:00
Nicolas Le Goff
f2e0b74998 Merge pull request #954 from romainneutron/task-manager 
[3.9] Updates to task manager
 2014-02-17 16:20:05 +01:00
Romain Neutron
53fff797a4 Add travis build on PHP 5.6 2014-02-17 15:54:08 +01:00
Nicolas Le Goff
7d77bef3e0 Merge pull request #859 from romainneutron/circular 
[3.9] Remove some circular references
 2014-02-17 14:20:47 +01:00
Romain Neutron
621bf7feec Prepend exec to commands 2014-02-17 12:30:04 +01:00
Romain Neutron
adaaf5b58a Use valid logger service 2014-02-17 12:30:04 +01:00
Romain Neutron
2a534615bb Update taskmanager versions 2014-02-17 12:30:03 +01:00
Romain Neutron
bdc93f0220 Remove some circular references 2014-02-17 12:25:18 +01:00
Nicolas Le Goff
b4a07c1469 Merge pull request #944 from romainneutron/websockets 
[3.9] Add websocket server
 2014-02-17 12:02:56 +01:00
Nicolas Le Goff
7537cce953 Merge pull request #940 from nlegoff/task_manager_backbone 
[3.9] Use backbone to display taskmanager front end
 2014-02-17 11:57:18 +01:00
Romain Neutron
ffab51235a Address PR comments 2014-02-15 12:05:05 +01:00
Romain Neutron
c0b152d73a Add authorization strategy for WAMP topics 2014-02-15 11:38:51 +01:00
Romain Neutron
a834b3a4df Add useful infos in session storage 2014-02-15 11:38:51 +01:00
Romain Neutron
8385493ae1 Bump to version 3.9.0-alpha.11 2014-02-15 11:38:51 +01:00
Romain Neutron
2c642f594f Add patch to version 3.9.0-alpha.11 2014-02-15 11:38:51 +01:00
Romain Neutron
811be51b3d Add WebsocketServer command 2014-02-15 11:38:51 +01:00
Romain Neutron
0fe18a2494 Add Websocket server 2014-02-15 11:38:51 +01:00
Romain Neutron
9238a939b3 Minimal fix for callback declaration 2014-02-15 11:38:51 +01:00
Romain Neutron
f181135cde Add task manager broadcaster subscriber 2014-02-15 11:38:51 +01:00
Romain Neutron
d0360a02b2 Remove signal listener once a signal has been caught 2014-02-15 11:38:50 +01:00
Romain Neutron
cec863ff7b Add check on libevent for production 2014-02-15 11:38:50 +01:00
Romain Neutron
ff5a3a6c16 Add dependency on Ratchet and react ZMQ 2014-02-15 11:38:50 +01:00