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,226 Commits 268 Branches 107 Tags
870d81eaf69dcd694d9ce03c3c008f0fb1e72b78
Commit Graph

28 Commits

Author SHA1 Message Date
mike-esokia
275730c3fb wip file upload 2018-06-01 17:19:05 +04:00
mike-esokia
3d50c59e89 add download function 
refactored code of personalisation logo section
wip - file upload
 2018-06-01 11:29:09 +04:00
mike-esokia
4d96feaf28 create form for uploading logo 
refactor admin setup layout for adding logo personalisation section
 2018-05-31 16:04:10 +04:00
Mike Ng
a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:46 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
Mike Ng
36b2058add PORT PHRAS-1555/PHRAS-1568 to 4.1 2017-11-22 15:48:36 +04:00
Xavier Rousset
0b16fd577e PHRAS-1234 Change wording on setup template 2016-09-27 12:24:03 +02:00
Benoît Burnichon
314f00ac2f Add missing form_errors calls. 
No integration currently done. Should be handled before release

PHRAS-534
 2015-05-20 16:23:26 +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
1250f8ab0b Fix latest merge 2014-06-19 16:11:27 +02:00
Nicolas Le Goff
94fc8c4c03 Fix PHRAS-130 autofill admin password in setup panel 2014-05-30 11:21:47 +02:00
Nicolas Le Goff
759a205025 Fix phras-46 display passwords fields as 'password' input 2014-04-23 16:49:37 +02:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +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
Nicolas Le Goff
4972e16fb4 Bootstrap task html views 
Bootstarp tasks html views
 2013-07-02 17:34:38 +02:00
Nicolas Le Goff
b5313cc540 Use bootstrap tool 2013-06-28 15:40:58 +02:00
Romain Neutron
6a1e63e317 Merge pull request #421 from romainneutron/rootpath 
[3.8] Remove registry's GV_RootPath calls
 2013-06-24 08:39:50 -07:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
ae89305575 Add better maintenance handling 2013-06-19 19:22:44 +02:00
Nicolas Le Goff
4ed16a8f75 Use html5 to validate setup form, use html5 fallback if client does not support this feature 
Add modernizr to admin group
 2013-06-14 20:13:16 +02:00
Romain Neutron
0e20116e66 [SearchEngine] Add support for queries by date 2013-01-17 12:01:41 +01:00
Romain Neutron
4677f0e9a2 Remove providers instanciation in Twig setup 2012-10-04 15:44:48 +02:00
Romain Neutron
23b842d4ca Remove custom Twig filters and tests in favor of legacy ones 2012-10-04 15:43:36 +02:00
Nicolas Le Goff
0d302699b8 fix template issue, re enable collection once disabled 
add more test for /bas controller
 2012-09-03 18:08:58 +02:00
Nicolas Le Goff
72a7dc95d5 refactor global_values & databases 2012-09-03 18:08:54 +02:00