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

153 Commits

Author SHA1 Message Date
Nicolas Le Goff
14e8580240 Remove display of captcha feature is not enable 2013-05-29 14:22:55 +02:00
Nicolas Le Goff
a4ab66df85 Add captcha macro 2013-05-29 14:22:53 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
ef2f6763ac Add missing slash 2013-05-24 19:42:42 +02:00
Romain Neutron
3638385b58 Move minify to dedicated controller, www directory cleanup 2013-05-24 14:37:55 +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
Romain Neutron
5928cb71ae Fix unit tests 2013-04-18 17:11:35 +02:00
Romain Neutron
6480cefbcd Merge branch '3.7' 2013-03-29 11:05:17 +01:00
Romain Neutron
538b90add0 Fix unit tests 2013-03-28 17:31:37 +01:00
Romain Neutron
a46bc98fb2 Enable etag in URI by default 2013-03-28 16:33:36 +01:00
Romain Neutron
c172ba7bbc Merge branch '3.7' 2013-03-28 14:37:57 +01:00
Romain Neutron
a193b8c473 Fix #1119 : Twitter and Facebook shares are available even if the system setting has been disabled 2013-03-25 15:12:05 +01:00
Romain Neutron
7343b164c1 Thesaurus refactor 2013-02-28 16:14:33 +01:00
Nicolas Le Goff
6b662710d7 Change report link in main menu bar 2013-02-14 20:09:50 +01: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
a0dda3ebe7 Fix #1059 : Remove tinyMCE as dependency 2013-01-08 19:41:41 +01:00
Romain Neutron
3a45a1f951 Fix success dialog box when ordering documents 2013-01-08 19:41:40 +01:00
Romain Neutron
52a7f58a31 Add better support for stories 2012-12-19 19:58:07 +01:00
Romain Neutron
0eaa5db98e Merge branch '3.7' 2012-12-17 15:30:05 +01:00
Romain Neutron
8cba369754 Fix #1028 : Replace javascript alert by dialog box in export dialog box 2012-12-12 16:21:53 +01:00
Romain Neutron
17e37741e8 Merge pull request #251 from nlegoff/cgu_utils 
Delete www/include/cguUtils.php
 2012-10-26 11:28:30 -07:00
Nicolas Le Goff
c11a3327a0 Delete cguUtils.php 2012-10-26 12:20:16 +02: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
2299fefacd Fix call to renew record URL 
Remove comments

Fix template error

Fix tests
 2012-10-19 17:32:18 +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
b54df27117 Escape JS string 2012-10-17 11:20:36 +02:00
Romain Neutron
ecd7db9bff Merge with 3.7 2012-10-16 16:18:01 +02:00
Nicolas Le Goff
e6b2727e06 #Fix #930 default display for unreacheable elements in all tabs 2012-10-16 16:06:01 +02:00
Romain Neutron
99630f773f Merge with 3.7 2012-10-16 15:56:43 +02:00
Nicolas Le Goff
4d84b37983 Fix #930 Defaut d'affichage d elements inaccessible au download 2012-10-16 13:54:56 +02:00
Romain Neutron
e8b32d8e03 Merge with 3.7 2012-10-10 11:34:21 +02:00
Romain Neutron
12ea1fc184 Add option to re-accept terms of use at download 2012-10-09 14:19:38 +02:00
Romain Neutron
697b234d54 Fix templates 2012-10-04 15:44:48 +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
2535a34efa Update menubar 2012-10-04 15:43:32 +02:00
Romain Neutron
ec11550eab Update templates 2012-10-04 15:42:53 +02:00