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

920 Commits

Author SHA1 Message Date
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
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
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
99630f773f Merge with 3.7 2012-10-16 15:56:43 +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
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
12ea1fc184 Add option to re-accept terms of use at download 2012-10-09 14:19:38 +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
bcc2e9a58c Updtae HTML5 icon 2012-10-05 16:40:38 +02:00
Romain Neutron
c762e7f0ab Registry is more strong 2012-10-05 15:29:19 +02:00
Romain Neutron
af257ef836 Escape command lines 2012-10-05 15:29:16 +02:00
Romain Neutron
2f5a92a6d5 Fix rewrite rules 2012-10-04 15:47:46 +02:00
Romain Neutron
8000c4f8db Update rewrite rules 2012-10-04 15:44:50 +02:00
Romain Neutron
f882bb90c9 Remove browser variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
c3b89aa1e4 Remove eventsmanager variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
1700565862 Cleanup namepaces, variables uses 2012-10-04 15:44:49 +02:00
Romain Neutron
65589f3b21 Remove get_registry method 2012-10-04 15:44:48 +02:00
Romain Neutron
c220bcf9df Applications cleanup 2012-10-04 15:43:36 +02:00
Romain Neutron
428f671995 Fix build 2012-10-04 15:43:36 +02:00
Romain Neutron
4fd744c316 update rewrite rules 2012-10-04 15:43:33 +02:00
Romain Neutron
5d2d49791d Fix report tests 2012-10-04 15:43:33 +02:00
Romain Neutron
5f25a9b8a5 Update rewrite rules 2012-10-04 15:43:31 +02:00
Romain Neutron
175ab367dd Update prod 2012-10-04 15:43:31 +02:00
Romain Neutron
b85867a8f6 Update admin 2012-10-04 15:43:31 +02:00
Romain Neutron
e2cb1fe0c9 Update client 2012-10-04 15:43:31 +02:00
Romain Neutron
4754c2cc8e Update common files 2012-10-04 15:43:31 +02:00
Romain Neutron
9e8bcad31d Update common files 2012-10-04 15:43:31 +02:00
Romain Neutron
6203835d0d Update report 2012-10-04 15:43:31 +02:00
Romain Neutron
48bb666774 Update thesaurus 2012-10-04 15:43:31 +02:00
Romain Neutron
f3b8558100 Switch Lightbox app to main app 2012-10-04 15:31:36 +02:00
Romain Neutron
9758aec8c9 Update rewrite rules 2012-10-04 15:31:36 +02:00
Romain Neutron
1a3461d5fc Update to filesystem service provider 2012-10-04 15:31:36 +02:00
Romain Neutron
ba25b8cc7c Merge with 3.7 2012-10-04 12:49:01 +02:00
romain
44f60b53e0 Reduce icons sizes 2012-10-04 11:59:25 +02:00
romain
09520db2b5 Fix #924 : Add permanent cookie only if necessary 2012-10-04 11:27:26 +02:00
Nicolas Le Goff
c96c89eee4 Fix #920 Publication thumbnails are not displayed 2012-10-03 12:13:37 +02:00
Romain Neutron
c837fafc96 Replace grey by transparency 2012-10-01 15:15:50 +02:00
Romain Neutron
c4c0309de6 Update placeholder 2012-10-01 14:53:00 +02:00
Romain Neutron
3413210b43 Add lazyload POC on answers 2012-10-01 14:39:03 +02:00
Romain Neutron
9dd1575dc9 Move Events Manager to service 2012-09-27 14:19:48 +02:00
Romain Neutron
b86c3ed0c0 Move Events Manager to service 2012-09-24 18:36:40 +02:00
Romain Neutron
2430a9245b post merge cleanup 2012-09-19 15:40:03 +02:00
Romain Neutron
fb5cb6b74a Update rewrite rules 2012-09-19 15:39:43 +02:00
Romain Neutron
4e18f12fe4 Rename files 2012-09-19 15:39:29 +02:00
jygaulier
90841c5ba1 fusion task, tasks, scheduler dans taskmanager 
todo : tests
 2012-09-17 14:16:15 +02:00
jygaulier
883cb1dec6 en cours : silexing taskmanager : add first tests 2012-09-17 13:38:19 +02:00
jygaulier
be24152468 en cours : silexing taskmanager 2012-09-17 13:38:19 +02:00