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
2,532 Commits 268 Branches 107 Tags
c2297f04a58dc27b95e34d7515e8221487b4522d
Commit Graph

780 Commits

Author SHA1 Message Date
Romain Neutron
b37703b506 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-13 12:16:59 +01:00
Nicolas Le Goff
85a7239c82 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-12 19:01:11 +01:00
Nicolas Le Goff
65cce08fad add task to check configuration file 2012-01-12 18:54:39 +01:00
Romain Neutron
56f620e6e6 Merge branch 'HotFix' into 3.6 2012-01-12 16:42:14 +01:00
Romain Neutron
6b60e88356 Fix serialize string in ACL 2012-01-12 16:41:07 +01:00
Romain Neutron
41f99bff9e Merge 2012-01-12 16:05:49 +01:00
Romain Neutron
65215d69e2 Fix collection cache name bug 2012-01-12 16:03:49 +01:00
Romain Neutron
aee1516d6c Add preview rights on validation 2012-01-12 15:44:28 +01:00
Romain Neutron
bf4d67872a Add \ACL constants for logging grant access 2012-01-12 14:28:07 +01:00
Romain Neutron
3d32dcd2ce Merge 2012-01-11 21:06:33 +01:00
Romain Neutron
e9beddc80e Fix include path bugs 2012-01-11 20:57:54 +01:00
Nicolas Le Goff
b774bfce9d Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-11 16:59:15 +01:00
Nicolas Le Goff
99296ec696 rename service.yml in services.yml 2012-01-11 16:40:29 +01:00
Nicolas Le Goff
bd986fade3 check if tech_datas has Width & Height key 2012-01-11 16:30:53 +01:00
Romain Neutron
2c3425a460 Merge 2012-01-11 15:35:57 +01:00
Romain Neutron
bffd7e6ce7 Fix #207 : cache is not well refreshed 2012-01-11 15:33:46 +01:00
Nicolas Le Goff
3125bdc7af Merge 2012-01-11 15:04:52 +01:00
Romain Neutron
4fc8da1d15 Fix #206 : search by date 2012-01-11 14:46:06 +01:00
Nicolas Le Goff
c5c4418020 load connexion from connexion file 2012-01-11 12:29:44 +01:00
Nicolas Le Goff
703f84177b modify static::is_installed 2012-01-11 12:26:21 +01:00
Nicolas Le Goff
1a5ec7d0cf check if configuration is installed 2012-01-11 12:25:43 +01:00
Nicolas Le Goff
cf513dd792 load connexion from connexion file 2012-01-11 12:24:40 +01:00
Nicolas Le Goff
0196f69f84 load connexion from connexion file 2012-01-11 12:24:23 +01:00
Nicolas Le Goff
8a12e24218 load connexion from connexion file & 
and modify create methode
 2012-01-11 12:24:06 +01:00
Romain Neutron
fc3bb9a6fd Merge with master 2012-01-11 12:15:30 +01:00
Romain Neutron
8dbedd0e87 Fix story export 2012-01-11 12:12:37 +01:00
Romain Neutron
f583cf60f8 Merge branch 'FixFTP' into 3.6 2012-01-11 11:57:43 +01:00
Romain Neutron
6d830053d1 Fix logfile 2012-01-11 11:56:47 +01:00
Romain Neutron
8a9b93c1ff Merge with master 2012-01-11 11:29:01 +01:00
Romain Neutron
85f44ce8c5 Do not alert when validation is finished 2012-01-11 11:24:01 +01:00
Romain Neutron
5c8d00397c Allox usr_mail to be null 2012-01-11 11:18:13 +01:00
Romain Neutron
10cab0374c Fix substitute 2012-01-11 11:01:22 +01:00
Romain Neutron
f7a669c07d Syntax 2012-01-11 10:44:36 +01:00
Romain Neutron
c239740542 Merge branch 'HotFix' into 3.6 2012-01-10 21:24:12 +01:00
Romain Neutron
a3ebb45317 Fix refactor 2012-01-10 21:07:29 +01:00
Romain Neutron
ecc82f6222 Merge master fix 2012-01-10 20:33:17 +01:00
Romain Neutron
543f805389 Fix migration from phrasea to doctrine manager 2012-01-10 20:30:22 +01:00
Romain Neutron
f8e5cc6426 Merge master fix 2012-01-10 20:30:03 +01:00
Romain Neutron
5587256ba4 Fix typo 2012-01-10 13:23:43 +01:00
Romain Neutron
319bbf2f3f Fix FTP pull 2012-01-10 13:23:31 +01:00
Romain Neutron
9c6071e77b Merge branch 'HotFix' into 3.6 2012-01-10 13:10:08 +01:00
Romain Neutron
f115e88021 Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-01-10 13:09:40 +01:00
Romain Neutron
1941785070 Fix available download elements 2012-01-10 13:08:30 +01:00
jygaulier
d44a29ff3f Merge with master 2012-01-10 12:16:43 +01:00
jygaulier
536876ac45 Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2012-01-10 12:14:31 +01:00
jygaulier
a9346df384 fix : status mask of user where not changed when applying a user template 
nb:
because a new user has all mask checked (all rights), a template will only UNCHECK boxes (remove rights):
- unchecked boxes on template will be unchecked on user
- checked boxes on template does nothing (left unchanged on user)
 2012-01-10 11:57:23 +01:00
Romain Neutron
ccf08e05eb Merge with master 2012-01-10 10:25:02 +01:00
Romain Neutron
ded3cdb3cc Substitution enhancement 2012-01-09 20:07:57 +01:00
Romain Neutron
0228edec5d Fix export caption 2012-01-09 18:50:26 +01:00
Romain Neutron
c01efe9d37 Fix record indexation 2012-01-09 18:24:41 +01:00