hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,336 Commits 268 Branches 107 Tags
1bae5e1e69b51cda6d67cca8fd9629efa85222cc
Commit Graph

3336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
3b4b04e3c6 WorkZone browser CSS 2012-01-10 20:28:42 +01:00
Romain Neutron
5a064954a2 WorkZone browser templates 2012-01-10 20:27:59 +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
Romain Neutron
09b5ceab3b Fix table layout for editing users on small screens 2012-01-10 13:08:07 +01:00
Romain Neutron
532b13649c Add link to basket browser 2012-01-10 12:50:21 +01:00
Romain Neutron
48ffdefc88 Add options to default dialog 2012-01-10 12:49:48 +01:00
Romain Neutron
162e690bcb Add browser queries 2012-01-10 12:49:29 +01:00
Romain Neutron
eebc52cd83 Basket Browser 2012-01-10 12:49:01 +01:00
Romain Neutron
fd09196305 Autoload for extensions 2012-01-10 12:48:53 +01:00
Romain Neutron
580b32b645 Add Doctrine Extensions 2012-01-10 12:48:04 +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
Nicolas Le Goff
8794436204 move to template Engine 2012-01-09 23:34:33 +01:00
Nicolas Le Goff
bb12ae81fb move to Orm 2012-01-09 23:33:29 +01:00
Romain Neutron
0b27c161c5 Fix editing records 2012-01-09 20:32:58 +01:00
Romain Neutron
de10de6a12 Substitution enhancement 2012-01-09 20:09: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
Romain Neutron
217d2e4db0 Fix collection cache 2012-01-09 18:24:32 +01:00
Romain Neutron
e4016ccd2f Fix User_Adapter in preview short history 2012-01-09 18:07:01 +01:00
Romain Neutron
465ded9c9f Reverted composer.json 2012-01-09 14:48:28 +01:00
Romain Neutron
cd28906c6b Bump to version 3.5.8 3.5.8 2012-01-06 18:15:27 +01:00
Romain Neutron
ad22cd791e Merge branch 'templates' into 3.6 2012-01-06 18:14:22 +01:00
Romain Neutron
354231b60b Add icon to templates user 2012-01-06 18:13:36 +01:00
Romain Neutron
927eb16070 Fix template name 2012-01-06 17:59:42 +01:00
Romain Neutron
3b8d31eb64 get_applied_template returns template login 2012-01-06 17:52:45 +01:00
Romain Neutron
be2f50e903 Merge with master 2012-01-06 17:42:11 +01:00
Romain Neutron
8768f86926 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-06 17:34:10 +01:00
Romain Neutron
b0e90f0df1 Fix #166 : empty cache on subdef generation 2012-01-06 17:26:26 +01:00
Nicolas Le Goff
9c334f2ed1 delete supertwig 2012-01-06 16:56:01 +01:00
Nicolas Le Goff
47f3ba2520 merge 2012-01-06 16:55:10 +01:00
Nicolas Le Goff
f6c3ff82ce add a service configuration file 2012-01-06 16:48:28 +01:00
Nicolas Le Goff
f42d856a87 add default options 2012-01-06 16:45:40 +01:00
Nicolas Le Goff
476ab9b807 set twig service for rendering templates 2012-01-06 16:41:08 +01:00
Nicolas Le Goff
5926916850 bootstrap core 2012-01-06 16:40:50 +01:00
Nicolas Le Goff
a6edc04f05 set twig service for rendering templates 2012-01-06 16:39:02 +01:00
Nicolas Le Goff
6c13bbb0d5 Create a new twig service 2012-01-06 16:37:52 +01:00
Nicolas Le Goff
dff7b5eff8 add Configuration::getServices method 2012-01-06 16:37:35 +01:00
Nicolas Le Goff
80bc7e7217 add Configuration\Application::getServiceFile method 2012-01-06 16:36:39 +01:00
Nicolas Le Goff
64a99dbffb add twig service 2012-01-06 16:35:37 +01:00
Nicolas Le Goff
90efca427b add twig service in core 2012-01-06 16:34:56 +01:00
Nicolas Le Goff
87eee16cde add twig service 2012-01-06 16:34:00 +01:00
Nicolas Le Goff
85a78052ea fix error with gd resizer processor 2012-01-06 16:33:33 +01:00