Commit Graph

920 Commits

Author SHA1 Message Date
Romain Neutron
d475e00cfa Merge with master 2012-02-07 17:47:39 +01:00
Romain Neutron
fb2b423cd8 Fix #320 2012-02-07 17:24:52 +01:00
Romain Neutron
dfa39b8f1e Fix bugs 2012-02-07 16:54:19 +01:00
Romain Neutron
5b28333da5 Merge with master 2012-02-07 14:51:36 +01:00
Romain Neutron
07d79f758b Merge with master 2012-02-07 14:30:00 +01:00
Romain Neutron
3f9cf2c7a0 Fix autoregister 2012-02-07 13:25:22 +01:00
Romain Neutron
624213f1c0 Fix build 2012-02-06 12:02:29 +01:00
Romain Neutron
662f45bdea Fix typo 2012-02-03 18:46:15 +01:00
Romain Neutron
da270a5fb5 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-02-03 18:12:53 +01:00
Romain Neutron
cf8129919d Refactor jquery dialogs 2012-02-03 18:12:13 +01:00
Nicolas Le Goff
b4e1bb6c22 update jquery.mousewheel.js from 3.2 to 3.6 2012-02-03 17:10:49 +01:00
Romain Neutron
8211396f14 Add Dialog.js to minify 2012-02-03 15:45:42 +01:00
Romain Neutron
1358bf89d0 Refactor modal dialogs CSS 2012-02-03 15:45:11 +01:00
Romain Neutron
5ffb6512cc Refactor modal dialogs 2012-02-03 15:44:34 +01:00
Romain Neutron
e9b3e2bb98 Removed bad case pix 2012-02-03 13:00:33 +01:00
Romain Neutron
abb830ba5a Remove the active class on unactive baskets 2012-02-03 12:59:12 +01:00
Romain Neutron
6b003bbe92 Enhancement of the answers status bar 2012-02-03 12:58:56 +01:00
Romain Neutron
9ec5c9c45e New push 16px icon 2012-02-03 12:58:34 +01:00
Romain Neutron
eba34c7150 Enhancement of answers status bar 2012-02-03 12:58:16 +01:00
Romain Neutron
829050bec0 Push icon 2012-02-03 12:32:31 +01:00
Romain Neutron
358ed226ec Fix css file path 2012-02-03 01:53:23 +01:00
Romain Neutron
7faa578704 Fix list saving 2012-02-03 01:25:36 +01:00
Romain Neutron
a8b6260c3b Fix #296 2012-02-02 20:43:55 +01:00
Romain Neutron
254801fda0 Fix #294 2012-02-02 19:45:28 +01:00
Romain Neutron
93b6921e9b Fix #295 2012-02-02 19:20:26 +01:00
Romain Neutron
cd2549ca17 Fix prod basket CSS overflow 2012-02-02 19:08:46 +01:00
Romain Neutron
0c8a7ac84e Removed console.log 2012-02-02 16:31:31 +01:00
Romain Neutron
203770fdee Fix typo 2012-02-02 16:27:44 +01:00
Romain Neutron
97bf29a5f2 Fix language detection 2012-02-02 16:19:27 +01:00
Romain Neutron
b3b53372c0 Push cleanup 2012-02-02 15:25:22 +01:00
Romain Neutron
8f52f9a6b2 Push & Feedback templates 2012-02-02 15:23:31 +01:00
Romain Neutron
fbd3c9c159 Push CSS 2012-02-02 11:27:11 +01:00
Romain Neutron
7976e94b73 resized PushBox 2012-02-02 11:26:54 +01:00
Romain Neutron
067561a734 Merge with master 2012-01-31 22:22:54 +01:00
Romain Neutron
a9c0740b3a Push javascript 2012-01-31 22:05:18 +01:00
jygaulier
72078aa836 - 2012-01-31 19:21:06 +01:00
Romain Neutron
99a344774f Coding standards 2012-01-31 18:35:27 +01:00
Romain Neutron
f94dce8571 Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6 2012-01-31 18:29:07 +01:00
Romain Neutron
1626246f7f Merge with master 2012-01-31 18:28:49 +01:00
Romain Neutron
ff4e7f1825 Fix tooltip in Client / IE 7 2012-01-31 18:24:56 +01:00
Romain Neutron
25c736525a Fix chgstatus 2012-01-31 15:59:51 +01:00
Romain Neutron
afb42193e7 Merge with master 2012-01-31 12:09:07 +01:00
Romain Neutron
04f4489f2d ENhanced push css 2012-01-31 12:01:54 +01:00
Romain Neutron
144352d0db Add push icons 2012-01-31 12:01:37 +01:00
Romain Neutron
022041c297 Add Search icon 2012-01-31 12:01:00 +01:00
Romain Neutron
0a9d1845a8 Upgraded to jQuery UI 1.8.17 2012-01-31 11:59:01 +01:00
Romain Neutron
15f533e74a Upgraded to jQuery UI 1.8.17 2012-01-31 11:58:24 +01:00
Romain Neutron
8e0d42333b Upgraded to jQuery UI 1.8.17 2012-01-31 11:58:08 +01:00
Romain Neutron
fd94d296f8 Upgraded to jQuery UI 1.8.17 2012-01-31 11:57:44 +01:00
Romain Neutron
6fb9efe1b3 Add a callback option to Phraseanet Alerts 2012-01-31 11:43:45 +01:00