hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,016 Commits 268 Branches 107 Tags
f047c83c17b1baac831136f8575e9f45cbcd9af9
Commit Graph

1090 Commits

Author SHA1 Message Date
Nicolas Le Goff
f047c83c17 Fix PR 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
a61779ee5a Add FTP client service provider 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
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
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
61e8347628 Fix master 2012-10-15 20:46:33 +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
Romain Neutron
12f60a5179 Fix typo 2012-10-09 19:52:02 +02:00
Romain Neutron
519205dec4 Fix installer 2012-10-09 19:51:59 +02:00
Romain Neutron
72af0d3c75 Fix typo 2012-10-09 19:34:36 +02:00
Romain Neutron
b940622a50 Fix installer 2012-10-09 14:39:25 +02:00
Romain Neutron
00f3a2bf61 Add binaries to configuration 2012-10-09 14:34:29 +02:00
Romain Neutron
c01af76587 Add TOU route 2012-10-09 14:18:31 +02:00
Romain Neutron
b9a7080357 Switch to binary config file 2012-10-05 16:43:18 +02:00
Romain Neutron
8459996df3 Bump to version 3.7.3 2012-10-05 15:29:18 +02:00
Romain Neutron
0f2c92654a Use record request 2012-10-04 22:15:35 +02:00
Romain Neutron
b129079e79 More precision in request parameters 2012-10-04 22:11:46 +02:00
Romain Neutron
246376d72f Cleanup root 2012-10-04 22:04:19 +02:00
Romain Neutron
4b1623a548 Remove dirty hack 2012-10-04 22:03:54 +02:00
Romain Neutron
bf46a6b25d Add patch 2012-10-04 18:22:54 +02:00
Romain Neutron
f990659d82 Remove twig global 2012-10-04 18:22:33 +02:00
Romain Neutron
7d4de53173 Fix docblocks and use declarations 2012-10-04 17:54:54 +02:00
Romain Neutron
08ef9ebad0 Add tests to guest access 2012-10-04 17:49:55 +02:00
Romain Neutron
c31ac156a0 Replace locale only if it is different 2012-10-04 17:25:34 +02:00
Romain Neutron
00c21edf30 Fix command line installer 2012-10-04 17:23:59 +02:00
Romain Neutron
5c87e7bc3b Add more firewall checks 2012-10-04 17:23:47 +02:00
Romain Neutron
4a79bdeb09 Add firewalls 2012-10-04 16:54:56 +02:00
Romain Neutron
a9a24d5424 Add firewalls 2012-10-04 16:54:47 +02:00
Romain Neutron
fae290f930 Remove unused argument 2012-10-04 16:53:18 +02:00
Romain Neutron
dc58e98289 Merge with 3.7 2012-10-04 16:30:50 +02:00
Romain Neutron
e844de6a72 Add tests to persistent cookie 2012-10-04 16:29:38 +02:00