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
6,627 Commits 268 Branches 107 Tags
96f77f99cd7b9cee7285dbb498464477520dfb0d
Commit Graph

6627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Le Goff
96f77f99cd Fix PHRAS-22 Force latest IE rendering engine 2014-04-10 18:15:08 +02:00
Nicolas Le Goff
317372eb96 Merge pull request #1048 from nlegoff/phras-57 
[PHRAS-57] Fix default checkbox state that notfify users on new publicat...
 2014-04-04 12:28:41 +02:00
Nicolas Le Goff
b354af8bef [PHRAS-57] Fix default checkbox state that notfify users on new publication 2014-04-04 11:14:45 +02:00
Nicolas Le Goff
aa07eba97f Merge pull request #1041 from nlegoff/api-enhancement 
[3.8][READY] Add some API enhancement
 2014-03-25 14:43:13 +01:00
Nicolas Le Goff
3468b2acc2 Add feed title in feed entry json schema 2014-03-24 12:26:55 +01:00
Nicolas Le Goff
83ef2ddb12 Merge pull request #1037 from nlegoff/fix-csv-dl 
[READY] [3.8] Fix csv generation mess
 2014-03-24 01:07:25 +01:00
Nicolas Le Goff
4cb735b4f1 Fix array declaration 2014-03-23 23:12:01 +01:00
Nicolas Le Goff
b3bd70fff1 Fix tests 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
1c8e31cb35 Fix fallback name 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
42cac0d3c4 Fix unit tests 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
417ae47f9f Fix namespaces 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
617c59a4ba Fix CSV report generation mess 2014-03-23 22:46:20 +01:00
Nicolas Le Goff
af7f51d83a Add CSVFile Response 2014-03-23 22:46:20 +01:00
Nicolas Le Goff
a159926a36 Add new CSVProvider 2014-03-23 22:46:20 +01:00
Nicolas Le Goff
5a14fb850d Delete old format class 2014-03-23 22:46:20 +01:00
Nicolas Le Goff
2f10a708d7 Merge pull request #1038 from nlegoff/fix-dashboard-report 
[READY][3.8] Report dashboard is now loaded on demand
 2014-03-23 19:06:00 +01:00
Nicolas Le Goff
89a61d2231 Merge pull request #1040 from nlegoff/fix-migration-old-password 
[READY][3.8] Set salted password to true when generating new password
 2014-03-23 19:05:35 +01:00
Nicolas Le Goff
b57068050c Merge pull request #1042 from moctardiouf/fixmigration 
[3.8] fix migration from 3.1
 2014-03-23 19:05:19 +01:00
Moctar
f6f6781a65 fix migration from 3.1 2014-03-21 20:40:03 +01:00
Nicolas Le Goff
8638bfb3d4 Add possibility to restrict aggregated feeds to a set of feeds 2014-03-21 17:52:12 +01:00
Nicolas Le Goff
db21aecd1d Fix unit tests 2014-03-20 02:14:43 +01:00
Nicolas Le Goff
a77a042770 Set salted password to true when generating new password 2014-03-20 01:00:05 +01:00
Nicolas Le Goff
266592213b Report dashboard is now loaded on demand 2014-03-18 16:59:03 +01:00
Nicolas Le Goff
6d79e44c9a Merge pull request #1030 from nlegoff/fix-bower-deps 
[3.8] Update bower dependencies
 2014-03-13 17:28:04 +01:00
Nicolas Le Goff
c994e38a78 Update bower dependencies 2014-03-13 15:59:04 +01:00
Nicolas Le Goff
1d77235b6a Merge pull request #1029 from nlegoff/fix1713 
[3.8] Fix status calculation form xml card index for stories as well
 2014-03-10 17:00:56 +01:00
Nicolas Le Goff
92ac485899 Fix status calculation form xml card index 2014-03-10 14:04:24 +01:00
Nicolas Le Goff
6e98568711 Merge pull request #1019 from jygaulier/3.8-fix1713 
fix #1713
 2014-03-10 11:58:21 +01:00
Romain Neutron
49f1de8fe4 Revert changes in tests 2014-03-05 14:57:20 +01:00
Nicolas Le Goff
3e7a36cff3 Merge pull request #1024 from romainneutron/3.8-cleanup 
[Ready][3.8] Remove unused files
 2014-03-05 11:49:33 +01:00
Romain Neutron
ea4a309005 Merge pull request #1023 from romainneutron/tests-exception-handler 
[3.8] Reset exception handler in tests setup
 2014-03-05 11:05:09 +01:00
Romain Neutron
f0ca05e720 Remove unused files 2014-03-05 02:41:06 +01:00
Romain Neutron
297a08492a Reset exception handler in tests setup 2014-03-05 02:18:18 +01:00
Jean-Yves Gaulier
9d9bd99078 fix #1713 2014-03-04 18:27:54 +01:00
Romain Neutron
975e8bd3c5 Merge pull request #1010 from nlegoff/fix-homepage-feed 
[Ready][3.8] Fix #1606 & #1712 Homepage does not display when deleting a feed
 2014-03-04 18:26:34 +01:00
Romain Neutron
c48b20edb7 Fix tests 2014-03-04 15:53:34 +01:00
Romain Neutron
8d2009cfef Add error reporting setting 
Conflicts:
	tests/classes/PhraseanetTestCase.php
 2014-03-04 15:40:33 +01:00
Nicolas Le Goff
1ce11430fe Fix #1606 & #1712 Homepage does not display when deleting a feed 2014-03-04 14:16:26 +01:00
Nicolas Le Goff
b8d2702975 Merge pull request #1002 from romainneutron/fix-1710 
[Ready][3.8] Fix 1710 : Add /me route + add user entities in API response
 2014-03-03 16:23:08 +01:00
Nicolas Le Goff
a55c23c013 Merge pull request #984 from romainneutron/h264 
[Ready][3.8] Add H264 pseudo stream configuration
 2014-03-03 15:03:31 +01:00
Nicolas Le Goff
4711675f52 Merge pull request #998 from romainneutron/fix-1705 
[Ready][3.8] Fix #1705 : MySQL connection might be lost after long operations
 2014-03-02 19:21:31 +01:00
Nicolas Le Goff
b3238808bd Merge pull request #1001 from romainneutron/fix-1707 
[Ready][3.8] Fix #1707 : Update technical informations and metadata fields on record substitution
 2014-03-02 19:14:06 +01:00
Romain Neutron
035576cefc Fix #1705 : MySQL connection might be lost after long operations 2014-03-02 02:19:13 +01:00
Romain Neutron
543b943285 Bump to version 3.8.4-alpha.1 2014-02-28 20:18:40 +01:00
Romain Neutron
a3b941c3ec Add H264 pseudo streaming tools 2014-02-28 20:18:40 +01:00
Romain Neutron
170c145e15 Merge pull request #1003 from nlegoff/fix-bin-detec 
[3.8] Fix binary version detection on debian system
 2014-02-28 19:50:27 +01:00
Nicolas Le Goff
2fcf8beec3 Fix unoconv version detection on debian system 2014-02-28 19:26:25 +01:00
Nicolas Le Goff
f593431463 Fix tests using GPAC on debian system 2014-02-28 19:25:26 +01:00
Romain Neutron
5585d7f7bd Fix #1707 : Update technical informations and metadata fields on record substitution 2014-02-28 19:10:23 +01:00
Romain Neutron
871b19c407 Merge pull request #997 from nlegoff/fix1703 
[3.8] Fix #1703 bridge is broken
 2014-02-28 19:08:34 +01:00