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
13,177 Commits 268 Branches 107 Tags
c85796fb29b38552b6897ae14cfadd993870d0c3
Commit Graph

46 Commits

Author SHA1 Message Date
mike-esokia
11e4f18127 add scroll for webkit 2018-05-11 13:08:05 +04:00
mike-esokia
d6e53ef104 fix ui and dialog lightbox mobile version 2018-05-11 10:50:43 +04:00
mike-esokia
b07f5aa07f add functionality to navigate between records in mobile version of lightbox 2018-05-10 11:57:08 +04:00
mike-esokia
43e5f89d2e fix jquery-mobile and mobile layout for lightbox 2018-05-08 13:39:22 +04:00
Florian BLOUET
2ce7b23a00 PHRAS-1115 - fix lightbox mobile events handling 2016-05-23 14:16:12 +02:00
Florian BLOUET
6adc597d0e frontent refactoring - move lighbox into phraseanet-production-client 2016-03-22 12:21:25 +01:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Florian BLOUET
f186091823 wip: component reorg, gathering js, css, images, ... 2015-12-02 17:35:36 +01:00
Florian BLOUET
3af725531b lightbox and report css refactoring, build tools cleanup 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
e9c6d1a56e Fix mess in prod (record & feed) templates 2014-12-04 11:48:11 +01: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
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
a805c94524 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
 2013-10-21 19:05:37 +02:00
Nicolas Le Goff
f9cd105e51 Fix #1497 Resizing images is not working on tablet in paysage mode 2013-10-18 16:11:54 +02:00
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +02:00
Andrey
289c0294b2 Rebased, fixed minor bugs 2013-09-05 13:44:04 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Nicolas Le Goff
66bcf32d81 Fix #1419 Fix resize issue on mobile view 2013-09-03 17:26:40 +02:00
Nicolas Le Goff
09a4fb52e0 Fix #993 Add send basket validation report in mobile view 2013-06-18 17:50:00 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
3638385b58 Move minify to dedicated controller, www directory cleanup 2013-05-24 14:37:55 +02:00
Romain Neutron
284f281958 Remove user var from templates 2012-10-04 15:43:36 +02:00
Romain Neutron
ec11550eab Update templates 2012-10-04 15:42:53 +02:00
Romain Neutron
09804c7586 Fix template calls to old http_request methods 2012-07-24 18:01:03 +02:00
Romain Neutron
2fd6ff1877 Fix templates 2012-07-24 13:13:25 +02:00
Romain Neutron
6eacc7d179 Update templates filepaths 2012-07-24 13:12:25 +02:00
Nicolas Le Goff
b7a34028e5 update URLS 2012-07-18 17:48:09 +02:00
Nicolas Le Goff
1031321e54 Change copyright date 2012-07-03 14:40:42 +02:00
Romain Neutron
ea3ff89416 Fix mobile app 2012-03-12 18:14:12 +01:00
Romain Neutron
8569a2d0ed Use "is_null" test for getting agreement 2012-02-14 17:22:59 +01:00
Romain Neutron
be2f50e903 Merge with master 2012-01-06 17:42:11 +01:00
Romain Neutron
d933c64b2f Use of secured scheme for external apis in case of https 2012-01-06 14:42:41 +01:00
Romain Neutron
5112c19235 Fix templates 2011-12-29 18:25:43 +01:00
Romain Neutron
646db61ca7 Refactor asket_adapter 2011-12-28 20:04:39 +01:00
Romain Neutron
763cceb4d1 Fix basket_adapter 2011-12-27 20:36:14 +01:00
Romain Neutron
bb03cb1344 Refactor basket_adapter 2011-12-27 14:07:27 +01:00
Romain Neutron
d42201986a Refactor basket_adapter 2011-12-26 10:47:56 +01:00
Romain Neutron
4c5b7eb658 V 3.5 RC 1 2011-12-05 00:23:28 +01:00
Alchemy
339d23c06d initial import 2011-02-16 16:09:48 +01:00