hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,312 Commits 268 Branches 107 Tags
6b25830afcec7461d0c38b446fe1cb1525c83d28
Commit Graph

5312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b592f2dc72 Fix template 
Conflicts:

	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
3ccc7f579f Remove debug output 2012-10-18 15:45:51 +02:00
Nicolas Le Goff
7c922c2ecc Use p4.dialog.box tool instead of jquery modal 
Conflicts:

	www/prod/page0.js
 2012-10-18 15:45:51 +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
bc115086ca Add export 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
b95954791e Add test in export, property, share, notifications && preferences controllers 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
e8258acf15 Remove old dialog box && update path to controllers in ajax call 
update path to controllers
 2012-10-18 15:45:49 +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
df62a30452 Merge branch '3.7' 2012-10-17 16:49:48 +02:00
Romain Neutron
c042bdc2d6 Update dutch translation 2012-10-17 16:49:05 +02:00
Romain Neutron
0347987184 Update dependencies 2012-10-17 14:47:49 +02:00
Romain Neutron
9e0b9162cc Fix registry calls 2012-10-17 14:47:32 +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
e302672a2e Fix firewall tests 2012-10-17 13:00:28 +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
fbd1644879 update installer 2012-10-16 19:08:38 +02:00
Romain Neutron
82f9ca4dac Re-enable firewall tests 2012-10-16 18:42:09 +02:00
Romain Neutron
a840dec29a Update dependencies 2012-10-16 18:41:52 +02:00
Romain Neutron
5fee16e81b Merge with 3.7 2012-10-16 17:34:07 +02:00
Romain Neutron
2af3c9b93c Update core test 2012-10-16 17:30:42 +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
50480217c6 Update locales, add nl_NL 2012-10-16 16:57:21 +02:00
Romain Neutron
ecd7db9bff Merge with 3.7 2012-10-16 16:18:01 +02:00
Romain Neutron
788b9be2b7 Merge pull request #240 from nlegoff/Fix 
#Fix #930 default display for unreacheable elements in all tabs
 2012-10-16 07:08:58 -07: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
Romain Neutron
57332c4aaa Merge pull request #239 from romainneutron/3.7.3 
Fix tickets
 2012-10-16 06:48:38 -07: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
fbf538552e Fix #939 : Refresh lazy loaded image when closing the workzone 2012-10-16 15:21:32 +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
08f4074ab0 Update dependencies 2012-10-16 15:21:20 +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
1faba7a2c9 Merge pull request #238 from nlegoff/Fix 
Fix #930 Defaut d'affichage d elements inaccessible au download
 2012-10-16 05:32:31 -07:00