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

67 Commits

Author SHA1 Message Date
aina-esokia
acc59ec42a List manager : add email domain in filter box 2019-03-08 15:39:58 +04:00
Filip Vilic
dd26c4dcc7 PHRAS-2220_feedback_window_UI__correction 2018-09-21 20:24:42 +02:00
Nicolas Maillat
fa379500c4 Merge pull request #2741 from filipx/PHRAS-2221_list_manager_UI___corrections_NEW 
PHRAS-2221_list_manager_UI___corrections_NEW
 2018-09-19 21:28:08 +00:00
Filip Vilic
25afbc5311 PHRAS-2221_list_manager_UI___corrections 2018-09-19 14:13:52 +02:00
Filip Vilic
04590f4acb PHRAS-2219_push_window__corrections fix 2018-09-19 13:07:43 +02:00
Nicolas Maillat
7fb2ab4456 Merge pull request #2738 from filipx/PHRAS-2222_list_manager_advance_mode__corrections 
PHRAS-2222_list_manager_advance_mode__corrections
 2018-09-17 22:32:41 +00:00
Filip Vilic
c8ce9ce322 PHRAS-2222_list_manager_advance_mode__corrections 2018-09-17 15:08:41 +02:00
Filip Vilic
e40a524365 PHRAS-2221_list_manager_UI__corrections 2018-09-17 10:54:29 +02:00
Filip Vilic
6f915f0f1f PHRAS-2223_list_manager___corrections 2018-09-14 14:25:47 +02:00
Nicolas Maillat
23cd533ba1 Merge pull request #2725 from filipx/PHRAS-2100_refactoring_list_manager_modals 
PHRAS-2100_refactoring_list_manager modals UI
 2018-09-06 12:18:26 +00:00
Filip Vilic
11035fe4a4 PHRAS-2100_refactoring_list_manager modals UI 2018-09-03 10:01:04 +02:00
Filip Vilic
2994bbf890 PHRAS-2186_list_manager_add_user modal styling 2018-08-20 16:49:29 +02:00
Filip Vilic
bb27de35a0 PHRAS-2186_list_manager_add_user 2018-08-14 11:49:48 +02:00
Filip Vilic
f6a86e6a86 PHRAS-2187 move selected people to top, fix page navigation 2018-08-08 11:48:37 +02:00
Filip Vilic
f2a96f8026 renaming label Template to Models 2018-08-02 14:53:14 +02:00
Filip Vilic
c7a286eb8a refactoring list manager 2018-07-30 11:16:13 +02:00
Florian BLOUET
ebd0fa5685 PHRAS-999 - push > list manager > remove useless notify button 2016-05-11 18:51:04 +02:00
Florian BLOUET
b2eb3abe0d wip: remove prod js modules dependencies 2016-03-18 10:08:08 +01:00
Florian BLOUET
5eec250624 modularize dialog Module (no more p4.dialog) 2016-03-18 10:08:07 +01:00
Florian BLOUET
c95fbc918a PHRAS-913 - fix typo 2016-01-20 11:49:57 +01:00
Florian BLOUET
37c674b5eb PHRAS-913 - fix counter display in users lists 2016-01-20 11:46:38 +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
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
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00
Nicolas Le Goff
2899f152fb Merge branch '3.8' into fix-latest-merge 
Conflicts:
	README.md
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/result.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskrun.php
	lib/classes/set/export.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/configuration.yml
	templates/web/admin/setup.html.twig
	templates/web/admin/tasks/list.html.twig
	templates/web/api/auth/end_user_authorization.html.twig
	templates/web/prod/actions/Feedback/list.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/upload/upload.html.twig
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/api/v1/api_v1_resultTest.php
 2014-08-11 20:28:03 +02:00
Nicolas Le Goff
c9adc6fd08 PHRAS-202 #fix deletion of diffusion list in IE 2014-07-23 19:42:11 +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
ed4ae71819 Fix test suite 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
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
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
0e5b1d62a1 Fix #1279 : Fix "share a list" template 2013-07-11 15:33:37 +02:00
Nicolas Le Goff
764fa42f14 Update to jquery ui 1.10.3 
Fix conflict & ui bugs

Remove debug
 2013-06-21 13:46:16 +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
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
77e571c973 Fix usrs list table 2012-07-19 13:31:10 +02:00
Romain Neutron
ca1341b55a Update twig templates 2012-07-17 15:01:12 +02:00
Ysolyne Gresille
1fff1faa5d bugfixes et updates for skins 2012-05-29 18:27:14 +02:00
Romain Neutron
8765328811 Fix display in small screen 2012-04-19 10:46:22 +02:00
Romain Neutron
82d9eeef7b Coding standards 2012-03-09 12:49:13 +01:00
Nicolas Le Goff
cac45f65d3 enhance push front 2012-03-06 18:34:30 +01:00
Nicolas Le Goff
1445d624aa fix unshare list 2012-03-06 17:45:28 +01:00
Nicolas Le Goff
a394206bd1 fix #469 Amélioration sur l'ecran principale de la fenetre de liste 2012-03-06 16:30:25 +01:00