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

3005 Commits

Author SHA1 Message Date
Nicolas Le Goff
4a33adf660 Add sbas_from_bas twig filter function 2012-10-23 11:41:28 +02:00
Nicolas Le Goff
783bd3839b Add tests 2012-10-22 17:52:53 +02:00
Nicolas Le Goff
264ad1247c Fix watermark & stamp function definition 
Rename test Class

Destroy local test var
 2012-10-22 14:23:01 +02:00
Nicolas Le Goff
175448f562 Add '/prod/download/' controller to download a set of documents 2012-10-22 14:15:48 +02:00
Romain Neutron
f52ac63e0d Allow FTP null values 2012-10-22 09:43:12 +02:00
Nicolas Le Goff
ad762b0bc8 Fix CS & some refactor 
Fix tests

FIx tests
 2012-10-20 18:59:14 +02:00
Nicolas Le Goff
4b4bbddca0 Fix issue 2012-10-19 17:32:16 +02:00
Nicolas Le Goff
a2fdcea91b Add string 2012-10-19 17:32:16 +02:00
Nicolas Le Goff
ae447cad96 Update temporary pref namespace 2012-10-19 17:32:14 +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
12fe0c2283 Remove duplicated routes 
Fix Cs

FixCS
 2012-10-19 17:32:05 +02:00
Romain Neutron
c811a334ba Fix IE Download 2012-10-18 16:41:59 +02:00
Nicolas Le Goff
cb1395900e Fix query tests 2012-10-18 15:45:54 +02:00
Nicolas Le Goff
11210d88e4 update 2012-10-18 15:45:53 +02:00
Nicolas Le Goff
3d019d2020 update tests 2012-10-18 15:45:53 +02:00
Nicolas Le Goff
bda5821635 Split display status & type property into two separate controllers 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
f047c83c17 Fix PR 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
31fc0196f7 Throws LogicException when not search engine provided and needed 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
45c3e564df Fix PR 
Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	templates/web/prod/Share/record.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
1f4debee45 Fix Tests 
remove useless comment

Add end line

Conflicts:

	templates/web/prod/Share/record.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
89eac37046 Fix tools window 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
9b470a42da Fix catch wrong exception 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
6d32acaa3d Add record property tests 2012-10-18 15:45:50 +02:00
Nicolas Le Goff
33c63bb038 Fix url parameter 
remove unused namespace
 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
Nicolas Le Goff
9ccb4595bc Generate export folder name in set_export class to avoid quering database to build the name 2012-10-18 15:45:50 +02:00
Nicolas Le Goff
a61779ee5a Add FTP client service provider 2012-10-18 15:45:49 +02:00
Nicolas Le Goff
698bd75554 Fix disorder betwwen variables name 2012-10-18 15:45:49 +02:00
Nicolas Le Goff
1c1c77e28d Fix missing container in FTP tasks 2012-10-18 15:45:49 +02:00
Nicolas Le Goff
8710e0f3cb Refactor record property (status, type) 
update property route

Fixed status

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Record/Property.php
 2012-10-18 15:45:49 +02:00
Romain Neutron
72d585d01e Update patch 2012-10-17 14:44:08 +02:00
Romain Neutron
3682d3e5a5 Add key at install 2012-10-17 14:28:48 +02:00
Romain Neutron
fbd1644879 update installer 2012-10-16 19:08:38 +02:00
Romain Neutron
65241ffba4 Merge with 3.7 2012-10-16 17:26:45 +02:00
Romain Neutron
1371c65fe5 Update locales, add nl_NL 2012-10-16 17:00:14 +02:00
Romain Neutron
99630f773f Merge with 3.7 2012-10-16 15:56:43 +02:00
Romain Neutron
a032ac6d2f Fix #918 : Add wincache support 2012-10-16 15:21:34 +02:00
Romain Neutron
27c57b376d Fix #876 : when duplicating rights, limits, quotas and masks are also copied 2012-10-16 15:21:33 +02:00
Romain Neutron
091c246d8d Fix #936 : binaries file is not well written at install 2012-10-16 15:21:31 +02:00
Romain Neutron
5a3543f036 Fix #932 : min value for subdef video size 2012-10-16 15:21:31 +02:00
Romain Neutron
e02430324b Fix #926 : handle non-existent files 2012-10-16 15:21:30 +02:00
Romain Neutron
1d0a83000f Merge pull request #237 from jygaulier/fix937 
avoid sql search in extension when term was not found in thesaurus
 2012-10-16 05:35:40 -07:00
Romain Neutron
61e8347628 Fix master 2012-10-15 20:46:33 +02:00
jygaulier
49f00ce892 avoid sql search in extension when term was not found in thesaurus 
btw, fix the  #937
 2012-10-15 20:19:10 +02:00
Romain Neutron
4b5a58cc60 Fix registry 2012-10-10 13:04:30 +02:00
Romain Neutron
7612a98914 Fix registry 2012-10-10 13:04:05 +02:00
Romain Neutron
e8b32d8e03 Merge with 3.7 2012-10-10 11:34:21 +02:00
Romain Neutron
a9efc37f70 Merge pull request #232 from romainneutron/SecurityFix 
Version 3.7.3
 2012-10-10 01:30:56 -07:00