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,793 Commits 268 Branches 107 Tags
6ac004a24b7dc84845bc05e09f47d50b51a3c1cd
Commit Graph

3793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
8cca2b9f90 Merge pull request #213 from jygaulier/ArchiveTask 
fic CTRLC
 2012-09-14 07:41:01 -07:00
Romain Neutron
a80073395d Merge with 3.7 2012-09-14 16:18:22 +02:00
Romain Neutron
4e6753baa0 Merge pull request #215 from romainneutron/HotFixes 
Hot fixes
 2012-09-14 07:14:55 -07:00
Romain Neutron
177b622241 Revert SQL 2012-09-14 16:14:26 +02:00
Romain Neutron
bded0d2df1 Fix CS 2012-09-14 16:13:28 +02:00
Romain Neutron
b6faccb50d Fix Feed Collection 2012-09-14 15:23:06 +02:00
Romain Neutron
afc3806a2d Fix #893 && #894 2012-09-14 14:35:02 +02:00
Romain Neutron
39782c6b4c Fix typo 2012-09-14 14:16:48 +02:00
Romain Neutron
05055c7272 Add empty lazaret route 2012-09-14 14:16:24 +02:00
Romain Neutron
51e202459a Add media subdef test 2012-09-14 12:34:35 +02:00
Romain Neutron
61be8e4ad7 Split value of Phraseanet TF fields 2012-09-14 12:34:02 +02:00
Romain Neutron
0cb823f65e Enhance lightbox error message 2012-09-14 11:58:58 +02:00
Romain Neutron
b2f0c701ea Fix caption inclusion 2012-09-14 11:53:04 +02:00
Romain Neutron
a8209d8c1c Fix story picture definition 2012-09-14 11:43:08 +02:00
Ysolyne Gresille
a3ef37fc4d bugfix js admin demand 2012-09-13 19:19:02 +02:00
Ysolyne Gresille
39d1a0a5b9 Admin demande page updated 2012-09-13 18:50:09 +02:00
jygaulier
cd95cfa152 fic CTRLC 2012-09-13 16:53:23 +02:00
Ysolyne Gresille
850293ea86 template fixes for admin 2012-09-13 14:37:25 +02:00
Romain Neutron
6b0aff4d72 Merge branch '3.7' 2012-09-13 12:47:23 +02:00
Romain Neutron
b5079ffacf Add better exception message 2012-09-13 12:44:37 +02:00
Romain Neutron
4bb1a1d870 Merge branch '3.7' 2012-09-13 12:31:20 +02:00
Romain Neutron
c2a78c9d19 Merge pull request #212 from romainneutron/ArchiveTask 
Archive task
 2012-09-13 03:30:31 -07:00
Romain Neutron
8dc6afc88f Switch to constants 2012-09-13 12:29:48 +02:00
Romain Neutron
6ce46aed18 Fix archive task 2012-09-13 12:29:38 +02:00
Romain Neutron
f1df64d512 Merge with 3.7 2012-09-13 11:30:58 +02:00
Romain Neutron
7150a3e9b0 Merge pull request #211 from romainneutron/master 
Merge with 3.7
 2012-09-13 02:29:45 -07:00
Romain Neutron
508cc2fc23 Merge pull request #210 from romainneutron/Fix3.7 
Add unit tests
 2012-09-13 02:27:10 -07:00
Romain Neutron
52788c2829 Add unit tests 2012-09-13 11:17:49 +02:00
Romain Neutron
87dce41e77 Fix connection 2012-09-13 10:50:35 +02:00
grosroro
812f5817ad Fix tests 2012-09-12 17:10:26 +02:00
grosroro
9967e6aa5e Fix tests 2012-09-12 16:42:36 +02:00
grosroro
7c9aae79d0 Fix tests 2012-09-12 15:35:01 +02:00
Romain Neutron
2b4427277e Update dependencies 2012-09-12 14:49:56 +02:00
grosroro
96c60f690a Fix tests 2012-09-12 14:36:18 +02:00
grosroro
4eebaf51c1 Fix tests 2012-09-12 14:36:18 +02:00
Romain Neutron
5bc45e11ae Update locale 2012-09-12 14:35:41 +02:00
Romain Neutron
153545e002 Add dirty hack to fix download under HTTPS with IE 2012-09-12 14:35:41 +02:00
Romain Neutron
1c592224d9 Add option -y (answer yes to all questions) and -f (force upgrade even if a concurrent one is running) to system:upgrade command 2012-09-12 14:35:41 +02:00
Romain Neutron
8f5dee2d05 Bump to version 3.7.1 2012-09-12 14:27:06 +02:00
Romain Neutron
ae041cd472 Update locale 2012-09-12 14:27:05 +02:00
Ysolyne Gresille
58f718f773 new email template 2012-09-12 11:12:14 +02:00
Romain Neutron
69cd973bca Merge pull request #207 from romainneutron/BugPrinter 
Add dirty hack to fix download under HTTPS with IE
 2012-09-10 10:15:13 -07:00
Romain Neutron
7600e08117 Add dirty hack to fix download under HTTPS with IE 2012-09-10 17:55:13 +02:00
Romain Neutron
3aa3af8a19 Merge pull request #206 from romainneutron/Console 
Add option -y and -f to system:upgrade command
3.7.1RC1 		2012-09-10 05:51:39 -07:00
Romain Neutron
35df701d4c Add option -y (answer yes to all questions) and -f (force upgrade even if a concurrent one is running) to system:upgrade command 2012-09-10 13:39:48 +02:00
Romain Neutron
16c49b3382 Merge pull request #187 from nlegoff/order 
Refactor orders
 2012-09-07 09:43:26 -07:00
Romain Neutron
c67652b167 Merge 3.7 2012-09-07 18:22:52 +02:00
Romain Neutron
ff449104bd Fix typo 2012-09-07 18:15:25 +02:00
Romain Neutron
5a4f4ecb3f Merge pull request #204 from nlegoff/37_tests 
37 tests
 2012-09-07 08:43:24 -07:00
Nicolas Le Goff
b1d087377a undo change 2012-09-07 17:02:48 +02:00