hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,163 Commits 268 Branches 107 Tags
cc2869464eed6db8cf742f81696d5a85b68cbcc8
Commit Graph

34 Commits

Author SHA1 Message Date
Harrys Ravalomanana
cc2869464e PHRAS-2888 Remove unused translation 2020-04-21 16:19:19 +04:00
Harrys Ravalomanana
a66c813835 PHRAS-2282 change icon 2019-09-17 14:15:27 +04:00
Harrys Ravalomanana
be9220969b PHRAS-2282 #time 4h 2019-09-17 13:34:06 +04:00
Harrys Ravalomanana
a1ce905c73 PHRAS-2282 #comment Add fix #time 3h 2019-09-12 17:31:01 +04:00
Nicolas Maillat
3c6f12c5d9 Merge branch 'master' into PHRAS-2282_design_of_new_Browser_basket_windows 2019-09-10 12:37:39 +02:00
aynsix
80dcf98e1f fix basket browser windows nok 2019-08-19 15:24:04 +04:00
Harrys Ravalomanana
816225036f PHRAS-2282 add loader on results display 2019-08-14 16:26:16 +04:00
Harrys Ravalomanana
0d84aa040a PHRAS-2282 #comment fix next page or previous page display for results #time 3h 2019-08-14 16:18:15 +04:00
Harrys Ravalomanana
e7ec57346a PRHAS-2282 #comment fix JY comments 2019-08-08 13:56:44 +04:00
Harrys Ravalomanana
366c486733 PHRAS-2282 #comment add new design #time 24h 2019-08-07 16:43:53 +04:00
Florian BLOUET
f186091823 wip: component reorg, gathering js, css, images, ... 2015-12-02 17:35:36 +01:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
 2015-07-02 12:33:18 +02:00
Nicolas Le Goff
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
b341495c88 Fix tests 2014-02-19 17:29:26 +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
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
16c1930ca0 Update templates to fit the new translator 2013-12-03 20:02:40 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +01:00
Romain Neutron
3548421160 Add basket converter 2013-11-13 17:52:12 +01:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
5df6e262df Merge pull request #313 from romainneutron/auth-providers 
[3.8] Auth providers
 2013-05-29 10:44:31 -07:00
Nicolas Le Goff
fb6ed1c1fe Fix #785 Add possibility to delete baskets from workzone browser 2013-05-29 14:29:49 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
697b234d54 Fix templates 2012-10-04 15:44:48 +02:00
Romain Neutron
ec11550eab Update templates 2012-10-04 15:42:53 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
Romain Neutron
6c1054420f Use lazyload as fallback 2012-10-01 15:06:10 +02:00
Romain Neutron
63e554519c Update templates 2012-07-24 13:12:23 +02:00
Romain Neutron
c1af665180 Update baskets fix 2012-03-05 18:03:42 +01:00
Romain Neutron
40ada806d9 Fix user and tooltips urls 2012-02-08 17:45:40 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
810e42a15d Browser templates 2012-01-11 20:59:18 +01:00
Romain Neutron
5a064954a2 WorkZone browser templates 2012-01-10 20:27:59 +01:00