hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,182 Commits 268 Branches 107 Tags
a15ee1d729ef348f6d291671434e16d2cc7b51ef
Commit Graph

1439 Commits

Author SHA1 Message Date
Romain Neutron
527b68e0f5 Merge with 3.7 2012-11-07 16:16:13 +01:00
Romain Neutron
fd4a3cc808 Fix tests 2012-11-06 15:36:47 +01:00
Romain Neutron
da6f7a00c0 Fix simplexml calls 2012-11-06 15:06:11 +01:00
jygaulier
e9b1737291 CS 2012-11-05 18:12:51 +01:00
jygaulier
2a75b76f32 fix #977 (redirection vers collection dans task archive) 
fix #969 (arrêt de la task d'archivage)
fix #982 (symfony/process returnValue = -1)
 2012-11-05 18:12:51 +01:00
Romain Neutron
d25bae42a7 Fix #990 : add check on posix support for pcntl 2012-11-05 16:49:36 +01:00
Romain Neutron
b195375614 Fix #991 : add filename extension for document-class subdefs differents than document 2012-11-05 16:48:41 +01:00
Romain Neutron
bc2d26472b Fix #983 : Fix download of basket containing slash in their titles 2012-11-05 16:48:40 +01:00
Romain Neutron
042ae35eca Fix #985 : Thesaurus bouncing 2012-11-05 16:46:47 +01:00
Romain Neutron
cafe4cc864 Merge pull request #261 from romainneutron/Download 
[3.7] Fix 3 latest tickets
 2012-11-05 07:18:15 -08:00
Romain Neutron
8496d393e7 Fix #990 : add check on posix support for pcntl 2012-11-05 15:17:18 +01:00
Romain Neutron
681ad3224a Fix #991 : add filename extension for document-class subdefs differents than document 2012-11-05 15:17:18 +01:00
Romain Neutron
c1f8f0bb8a Fix #983 : Fix download of basket containing slash in their titles 2012-11-05 15:16:52 +01:00
Romain Neutron
1739dfd075 Merge pull request #259 from romainneutron/Fixes 
Fix #985 : Thesaurus bouncing
 2012-10-31 03:13:47 -07:00
Romain Neutron
3cb57c2709 Merge pull request #260 from jygaulier/fix976 
Fix976
 2012-10-31 03:13:34 -07:00
jygaulier
b79a9ba30b fix #976 edit : character change when editing with thesaurus 
fix also display caption junk when a thesaurus term has no entry in the current language
 2012-10-31 11:09:23 +01:00
Romain Neutron
694033b909 Fix #985 : Thesaurus bouncing 2012-10-31 09:55:22 +01:00
Romain Neutron
49dcfeba9f Cleanup 2012-10-30 11:39:58 +01:00
Romain Neutron
f0fed8bb7e Merge with 3.7 2012-10-30 11:27:50 +01:00
Romain Neutron
cfc02d39c6 Fix #965 : add ghostscript binary 2012-10-29 14:35:28 +01:00
Romain Neutron
b8ae0eece5 Fix #971 : Removing a story must remove its presence in all workzones 2012-10-29 14:19:34 +01:00
Nicolas Le Goff
9c1819fa74 Fix missing app assignement 2012-10-26 12:18:25 +02:00
Romain Neutron
3ac5e0c6c3 Fix reminders not saved in DB 2012-10-25 17:35:46 +02:00
Romain Neutron
12feb56958 Merge pull request #245 from nlegoff/add_prod_download_token 
Add Silex "/download/" controller
 2012-10-25 03:36:04 -07:00
Nicolas Le Goff
8ed80f89c3 Fix issue with DI container 2012-10-25 11:14:07 +02:00
Nicolas Le Goff
52eb3ed48d Update functions signature for compatibility with PHP 5.4 2012-10-25 11:14:07 +02:00
Romain Neutron
442f02cd07 Fix reminders not saved in DB 2012-10-25 10:47:29 +02:00
Romain Neutron
becee5f233 Merge with 3.7 2012-10-24 13:45:02 +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
ae447cad96 Update temporary pref namespace 2012-10-19 17:32:14 +02:00
Romain Neutron
c811a334ba Fix IE Download 2012-10-18 16:41:59 +02:00
Nicolas Le Goff
3d019d2020 update tests 2012-10-18 15:45:53 +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
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
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
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
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
99630f773f Merge with 3.7 2012-10-16 15:56:43 +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
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
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
Romain Neutron
7a2f5332c2 Add test on binaries presence 2012-10-09 19:33:42 +02:00