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
6,516 Commits 268 Branches 107 Tags
f4428d2ff468f10c4d9b51f82bb8745ec737b6e8
Commit Graph

491 Commits

Author SHA1 Message Date
Romain Neutron
527b68e0f5 Merge with 3.7 2012-11-07 16:16:13 +01:00
Nicolas Le Goff
f78192e590 Throw forbidden exception when user can not delete an account 2012-11-06 16:08:10 +01:00
Nicolas Le Goff
007518f225 Fix CS & escape javascript ouptut 2012-11-06 15:46:05 +01:00
Nicolas Le Goff
b02c8d7ebb Fix #956 Bridge Apis account are now deletable 2012-11-06 15:00:26 +01:00
Romain Neutron
f0fed8bb7e Merge with 3.7 2012-10-30 11:27:50 +01:00
Romain Neutron
39e1eb9945 Fix #970 : fix default sort mode 2012-10-29 18:36:45 +01:00
Romain Neutron
9d12675bcb Fix #974 : Move story children as long as story 2012-10-29 15:05:39 +01:00
Romain Neutron
43e03bfdff Fix #968 : Display job and company in push search engine 2012-10-29 14:02:08 +01:00
Romain Neutron
5bca701712 Merge pull request #254 from nlegoff/preview_record 
Refactor record preview details controller
 2012-10-26 11:29:46 -07:00
Nicolas Le Goff
11cd55b2b3 Add test & Fix bug in DenyTOU route & Format controller 2012-10-26 12:20:16 +02:00
Nicolas Le Goff
c11a3327a0 Delete cguUtils.php 2012-10-26 12:20:16 +02:00
Nicolas Le Goff
b91fe68b0a Check for env parameter 2012-10-26 12:18:24 +02:00
Nicolas Le Goff
11b521de8b Refactor record detailed view controller 
Fix typo

Fix Typo
 2012-10-26 12:18:24 +02:00
Romain Neutron
f4b60eb291 Merge with 3.7 2012-10-25 17:41:57 +02:00
Romain Neutron
4264a9aed6 Fix #960 : Symfony MimeType guesser uses Fileinfo before File Binary 2012-10-25 17:34:00 +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
103e46891a Add anonymous export option 2012-10-25 11:14:10 +02:00
Nicolas Le Goff
a0327024a5 Remove debug 2012-10-25 11:14:10 +02:00
Nicolas Le Goff
c9d04ae757 Fix download prepare template issue 2012-10-25 11:14:09 +02:00
Nicolas Le Goff
5578329e2d Use end instead of array_pop to fetch record so the record list will no be empty and record will be logged 2012-10-25 11:14:08 +02:00
Nicolas Le Goff
e07ff6154a Update /download/ Controller 2012-10-25 11:14:08 +02:00
Nicolas Le Goff
60e01595e1 Set DI container as \set_export::build_zip parameter 2012-10-25 11:14:07 +02:00
Nicolas Le Goff
3e18c50a5f Update /download/controller/ 2012-10-25 11:14:07 +02:00
Nicolas Le Goff
1fec457867 Rename route && update path 
Update path
 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
Romain Neutron
c4e074f157 Fix #960 : Symfony MimeType guesser uses Fileinfo before File Binary 2012-10-24 13:38:12 +02:00
Nicolas Le Goff
ac1872b82b Add DoDownload controller 2012-10-23 11:45:00 +02:00
Nicolas Le Goff
eea7b39e26 Change redirect path from /prod/download/ to /download/ 2012-10-23 11:44:01 +02:00
Nicolas Le Goff
783bd3839b Add tests 2012-10-22 17:52:53 +02:00
Nicolas Le Goff
175448f562 Add '/prod/download/' controller to download a set of documents 2012-10-22 14:15:48 +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
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
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
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
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
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
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
61e8347628 Fix master 2012-10-15 20:46:33 +02:00
Romain Neutron
e8b32d8e03 Merge with 3.7 2012-10-10 11:34:21 +02:00