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,133 Commits 268 Branches 107 Tags
27fc36134247bd710e10970192ffc51dc5410cdf
Commit Graph

52 Commits

Author SHA1 Message Date
Harrys Ravalomanana
27fc361342 PHRAS-3022 Prod editing #comment Clean PR with translation 2020-04-14 20:37:59 +04:00
Harrys Ravalomanana
4ab5d7f6ee PHRAS-3014 #comment fix Prod editing confirm before filling latitude and longitude #time 8h 2020-04-08 11:15:29 +04:00
Harrys Ravalomanana
c9871eb570 PHRAS-2945 #comment Prod-editing : Fix default height/min-height for editing_top_box #time 2h 2020-02-25 14:38:45 +04:00
Nicolas Maillat
729291ba01 Merge branch 'master' into PHRAS-2885-Prod-Add_missing_warning 2020-01-29 16:49:08 +01:00
Harrys Ravalomanana
55f4678c2f PHRAS-2885 Add missing warning when try to edit record from different db 2020-01-29 17:24:50 +04:00
Harrys Ravalomanana
f29be7f07b PHRAS-2885 2020-01-27 15:06:44 +04:00
Harrys Ravalomanana
2b15159fa2 PHRAS-2719 2020-01-24 10:54:53 +04:00
Harrys Ravalomanana
407c13b8c8 PHRAS-2719 2020-01-23 16:26:11 +04:00
Harrys Ravalomanana
b5248bf62e PHRAS-2719 #comment Fix multivalue fields selection #time 4h 2020-01-23 14:29:37 +04:00
Harrys Ravalomanana
0ea9508ce0 PHRAS-2875 upgrade of Phraseanet-production-client 2020-01-16 18:51:25 +04:00
Harrys Ravalomanana
442c953708 PHRAS-2809 #comment add hide field switch attribute gui_editable value #time 2h 2019-11-06 15:51:25 +04:00
Harrys Ravalomanana
44199925cd PHRAS-2721 #comment fix Edit form: multi-values submit #time 3h 2019-09-18 10:39:43 +04:00
mike-esokia
2c39cf503a refactor suggested values in edit view 2018-05-07 14:14:46 +04:00
aina-esokia
e8f9e9a883 position technical data to positive negative value 2018-04-12 09:48:09 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Florian BLOUET
20bdc9c5af PHRAS-1082 - fix preview icon in record editor 2016-05-09 16:41:23 +02:00
Florian BLOUET
588d10c2dc PHRAS-1016 - fix default selection to group instead of records for story editing 2016-02-26 13:04:26 +01:00
Florian BLOUET
07a0091e90 PHRAS-904 - fix ui issue in edit form 2016-01-21 16:05:47 +01:00
Florian BLOUET
ebaf36f2d2 PHRAS-845 - fix close button 
PHRAS-846 - fix admin log view
PHRAS-843 - fix action icons
added white skin
misc fix on skin color handling
replace image icons by fonts icons
 2015-12-02 17:35:42 +01:00
Florian BLOUET
34689daaa8 fix tooltip in record editor 
fix images path in record editor
wip: standardize font-sizes
 2015-12-02 17:35:41 +01:00
Florian BLOUET
170f1bd80d update favicons, fix ie8 issues in workzone, misc css fixes 2015-12-02 17:35:40 +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
54526abacb PHRAS-604 - fix size handling of editing panel 2015-07-21 14:40:33 +02:00
Benoît Burnichon
38ae7bc2ac Rename get_number/set_number to getNumber/setNumber 2015-07-13 17:50:20 +02: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
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
5721aae8c8 Fix PHRAS-134 Reportage is selected as wall in edit mode 2014-05-30 11:21:18 +02:00
Nicolas Le Goff
4cc82af980 Fix settings 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
54a5d6578c Replace getter and setter for user & user notif setting value 2014-02-19 17:28:53 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +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
3451895515 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-14 17:52:52 +01:00
Romain Neutron
84c444c186 Fix editing default user settings 2013-11-14 13:29:49 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
f444d4ed97 Merge pull request #491 from romainneutron/fix-1300 
[3.8] Fix 1300
 2013-07-11 09:46:22 -07:00
Romain Neutron
867be69b74 Fix #1300 : Story editing does not work 2013-07-11 16:17:49 +02:00
Romain Neutron
4e5591bb66 Fix #1298 : Preview tooltip URL has a double trailing slash 2013-07-11 12:49:41 +02:00
Nicolas Le Goff
ac6b3e439a Fix #1218 & 1219 Enhance sharing window 2013-06-28 17:15:48 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
769f319638 Update templates to display databox fields labels 2013-05-30 18:12:31 +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