hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,518 Commits 268 Branches 107 Tags
a9bb23fc5101452dd3ce8823895518f2fb1eb75c
Commit Graph

1045 Commits

Author SHA1 Message Date
Romain Neutron
a9bb23fc51 Merge branch '3.7' 2013-06-28 20:22:20 +02:00
Romain Neutron
08c770e818 Merge pull request #441 from nlegoff/some_bootstrap 
[3.8] Fix and tweak admin CSS using twitter bootstrap
 2013-06-28 11:17:04 -07:00
Romain Neutron
54dc6da9af Merge pull request #442 from nlegoff/fix_prod_issues 
[3.8] Fix some prod issues
 2013-06-28 11:00:47 -07:00
Nicolas Le Goff
9297d2f6b5 Fix #1203 Do not display story creation form if user do not have appropriate rights 2013-06-28 17:51:44 +02:00
Nicolas Le Goff
ac6b3e439a Fix #1218 & 1219 Enhance sharing window 2013-06-28 17:15:48 +02:00
Nicolas Le Goff
b5313cc540 Use bootstrap tool 2013-06-28 15:40:58 +02:00
Nicolas Le Goff
746aace93b Fix bad controller binding 2013-06-28 15:35:01 +02:00
Nicolas Le Goff
06f2ebcc0a Fix #1212 Broken advanced search 2013-06-28 13:13:07 +02:00
jygaulier
c378bbdfce fix #1210 2013-06-27 15:43:31 +02:00
Romain Neutron
05f4267e28 Merge pull request #428 from romainneutron/rollover-answer 
[3.8] Fix answer rollover URL
 2013-06-25 04:32:36 -07:00
Romain Neutron
c16458a0bd Fix answer rollover URL 2013-06-25 11:27:27 +02:00
Romain Neutron
7a241bd103 Merge pull request #425 from nlegoff/fix_847 
[3.8] Fix #847 About link in lightbox
 2013-06-25 01:25:58 -07:00
Romain Neutron
94ed0a90e4 Merge pull request #423 from nlegoff/jquery_ui_1.10.3 
[3.8] Update jquery-ui 1.8 to 1.10.*
 2013-06-24 10:49:48 -07:00
Romain Neutron
6a1e63e317 Merge pull request #421 from romainneutron/rootpath 
[3.8] Remove registry's GV_RootPath calls
 2013-06-24 08:39:50 -07:00
Nicolas Le Goff
0bc951baba Fix #847 About link in lightbox 2013-06-24 16:16:42 +02:00
Nicolas Le Goff
90bc96b72a Fix tooltip + enhancement 
Adressed PR's comment

Fix CSS issue
 2013-06-24 15:50:59 +02:00
Nicolas Le Goff
764fa42f14 Update to jquery ui 1.10.3 
Fix conflict & ui bugs

Remove debug
 2013-06-21 13:46:16 +02:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
ae89305575 Add better maintenance handling 2013-06-19 19:22:44 +02:00
Romain Neutron
98bb412575 Merge pull request #417 from nlegoff/fix_993 
[3.8] Fix #993 Add send report button for basket validation in lightbox in mobile view
 2013-06-19 08:50:46 -07:00
Nicolas Le Goff
4eb702de93 Fix js path 
Remove real path
 2013-06-19 16:14:04 +02:00
Nicolas Le Goff
4b4c516a8e Fix #883 Resize img accoring to device orientation 2013-06-18 18:08:33 +02:00
Nicolas Le Goff
05fe6d79ad Remove index mobile view as new login view is mobile is now responsive 2013-06-18 17:50:00 +02:00
Nicolas Le Goff
09a4fb52e0 Fix #993 Add send basket validation report in mobile view 2013-06-18 17:50:00 +02:00
Nicolas Le Goff
07bd0de688 Fix template issue 2013-06-18 17:49:59 +02:00
Nicolas Le Goff
77dbbc9b94 Fix push form display 2013-06-18 17:49:58 +02:00
Romain Neutron
ca519612c6 Merge pull request #415 from romainneutron/locale 
[3.8] Update locales
 2013-06-18 06:33:20 -07:00
Romain Neutron
4fb39ff503 Update locales 2013-06-17 23:33:01 +02:00
Romain Neutron
1ea4c2e5a9 Merge pull request #405 from nlegoff/fix_788 
[3.8] Fix #788 Add a default basket
 2013-06-17 11:25:42 -07:00
Romain Neutron
d8427e0c2c Merge pull request #403 from romainneutron/orders 
[3.8] Update emails notifications
 2013-06-17 10:38:22 -07:00
Romain Neutron
784e454311 Update emails notifications 2013-06-17 19:37:52 +02:00
Romain Neutron
516f46c3d3 Merge pull request #408 from nlegoff/fix_1207 
[3.8] Fix #1207 Fix export button
 2013-06-17 10:36:02 -07:00
Romain Neutron
c8b61b3748 Merge pull request #409 from romainneutron/subdef-labels 
[3.8] Add localized labels in subdef editing
 2013-06-17 10:34:40 -07:00
Romain Neutron
241705a568 Merge pull request #399 from romainneutron/ip-proxies 
[3.8] Add trusted proxies configuration
 2013-06-17 10:28:49 -07:00
Romain Neutron
08c6ca4d26 Merge pull request #401 from nlegoff/fix_1131 
[3.8] Fix #1131 & remove jquery.validate* dependencies
 2013-06-17 10:06:29 -07:00
Romain Neutron
5b06914bca Add localized labels in subdef editing 2013-06-17 18:54:10 +02:00
Nicolas Le Goff
93ec7e702c Fix #1207 Fix export button 2013-06-17 18:48:26 +02:00
Nicolas Le Goff
7c226e3349 Fix typo 2013-06-17 17:25:42 +02:00
Nicolas Le Goff
a4fb3d958b Fix #788 Add a default basket 2013-06-17 17:20:14 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Nicolas Le Goff
0caa8754b6 Concatenate JS files 2013-06-17 15:39:46 +02:00
Romain Neutron
f6d975764e Merge branch 'fix_878' of https://github.com/nlegoff/Phraseanet into nlegoff-fix_878 2013-06-17 15:08:25 +02:00
Nicolas Le Goff
28658aaf98 Adress PR's comments 2013-06-17 12:35:21 +02:00
Nicolas Le Goff
164d012437 Reorder forms organisation add a way to custom view & add callback once error is rendered 2013-06-17 12:09:51 +02:00
Nicolas Le Goff
26a06f0178 Add renew email form validation 2013-06-17 12:09:01 +02:00
Nicolas Le Goff
4ed16a8f75 Use html5 to validate setup form, use html5 fallback if client does not support this feature 
Add modernizr to admin group
 2013-06-14 20:13:16 +02:00
Nicolas Le Goff
fc5fea2c2f Fix #1131 Add password strength validation 2013-06-14 16:55:29 +02:00
Nicolas Le Goff
9be2194485 Fix #878 Add delete from basket button in detailled view 2013-06-14 11:53:43 +02:00
Nicolas Le Goff
a846a81ec2 Remove unecessary slash 2013-06-14 11:44:30 +02:00
Romain Neutron
906d4ba9c5 Localize status bits 2013-06-14 09:47:54 +02:00