hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,312 Commits 268 Branches 107 Tags
6b25830afcec7461d0c38b446fe1cb1525c83d28
Commit Graph

5312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
e3c758aa5e Update submodule 2012-01-11 12:03:06 +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
77ef6504fa Allow disable of sendmail at the end of FTP 2012-01-11 11:55:48 +01:00
Romain Neutron
8a9b93c1ff Merge with master 2012-01-11 11:29:01 +01:00
Romain Neutron
de7931f7e2 Fix user_infos_tab overflow 2012-01-11 11:25:32 +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
6156bc0cbb Renamed prod/index.html 2012-01-11 10:43:55 +01:00
Romain Neutron
dc471acd9e Enhancement graphique prod 2012-01-11 10:43:24 +01:00
Romain Neutron
29b0d5d1a0 Enhancement graphique prod 2012-01-11 10:43:03 +01:00
Romain Neutron
8be9cac424 Update prod CSS 2012-01-11 10:42:18 +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
43dabbe867 Fix #196 : applya template during registration removes registration on other collections 2012-01-10 20:46:08 +01:00
Romain Neutron
ecc82f6222 Merge master fix 2012-01-10 20:33:17 +01:00
Romain Neutron
869a2f614c Added WorkZone browser routes 2012-01-10 20:32:00 +01:00
Romain Neutron
1d447341d5 Enhanced Basket archive route 2012-01-10 20:31:49 +01:00
Romain Neutron
b69ef07742 Added Doctrine loader to Core 2012-01-10 20:31:08 +01:00
Romain Neutron
e762f6fa23 Enhancement WorkZone browser 2012-01-10 20:30:46 +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
93cab95f33 Added WorkZone CSS 2012-01-10 20:29:46 +01:00
Romain Neutron
99ca258c1c Removed some console.log 2012-01-10 20:29:21 +01:00
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