hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,967 Commits 268 Branches 107 Tags
4310cae3620140085a50b72e39e40d08768e901b
Commit Graph

31 Commits

Author SHA1 Message Date
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
96b3f032aa Fix #1158 : Remove required attributes on non-required attributes in Order creation 2013-05-13 14:12:31 +02:00
Nicolas Le Goff
cdcceb24ec Refactor client 
Terminate baskets.php

Update Refactor

Fix grid layout

Fix page navigation issue when no results

Fix mainMenu position for ie6

Fix IE6 javascript errors

Fix some client bugs

Fix indent

cleanup

Add Client tests

Fix typo

FIx indent

Use new search engine API

Remove useless comments

Remove old client

Add cover annotations

CS fixer
 2013-01-28 14:09:49 +01:00
Romain Neutron
dff686c87d Merge branch '3.7' 2013-01-09 11:25:14 +01:00
Romain Neutron
0eaa5db98e Merge branch '3.7' 2012-12-17 15:30:05 +01:00
Nicolas Le Goff
ef9f806c7c Use phraseanet alert insteal of default 2012-10-26 12:19:52 +02:00
Nicolas Le Goff
8d74b99110 Fix JS issue due to new modal system && Fix path to /prod/export/Ftp 2012-10-26 12:19:52 +02:00
Nicolas Le Goff
8a6136b9fc Fix path to /export/mail 2012-10-25 11:14:11 +02:00
Nicolas Le Goff
1fec457867 Rename route && update path 
Update path
 2012-10-25 11:14:07 +02:00
Nicolas Le Goff
2ab81be63d Add path to the new controllers 2012-10-22 14:27:54 +02:00
Nicolas Le Goff
ec8d577a41 Add missing class declaration 
Fix tests

Update tests

Fix CS
 2012-10-19 17:32:12 +02:00
Nicolas Le Goff
a837ede270 Merge diaog export 2012-10-19 17:32:11 +02:00
Nicolas Le Goff
0c55cc6056 merge 
Conflicts:

	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
b592f2dc72 Fix template 
Conflicts:

	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
c40804287a Update refactor 
Fix indent

Conflicts:

	lib/Alchemy/Phrasea/Application/Root.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
19f1bca120 Fix CS 
Add comments

Remove bad ident

Undo modification

Conflicts:

	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Nicolas Le Goff
cde9ce18ae Add prod refactor 
Fix issue

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/User/Notifications.php
	lib/Alchemy/Phrasea/Controller/User/Preferences.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Romain Neutron
9e0b9162cc Fix registry calls 2012-10-17 14:47:32 +02:00
Romain Neutron
ecc6ccf380 Merge with 3.7 2012-10-17 11:25:01 +02:00
Romain Neutron
ecd7db9bff Merge with 3.7 2012-10-16 16:18:01 +02:00
Romain Neutron
99630f773f Merge with 3.7 2012-10-16 15:56:43 +02:00
Romain Neutron
e8b32d8e03 Merge with 3.7 2012-10-10 11:34:21 +02:00
Romain Neutron
4677f0e9a2 Remove providers instanciation in Twig setup 2012-10-04 15:44:48 +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
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
Nicolas Le Goff
74ce2341a2 delete set_ordermanager & set_exportorder classes 2012-09-07 12:06:06 +02:00
Nicolas Le Goff
623469063f refactor /prod/order/ 
add tests

fix tests

use url_generator & remove debug variable

remove jquery.order.js from  minify

use proper way to pass parameters when building URL with url_generator
 2012-09-07 12:06:05 +02:00
Nicolas Le Goff
0494590523 add order controller 
add order controller
 2012-09-07 12:06:04 +02:00
Romain Neutron
63e554519c Update templates 2012-07-24 13:12:23 +02:00
Romain Neutron
be3b098747 Rename twig templates 2012-07-24 13:12:22 +02:00