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,336 Commits 268 Branches 107 Tags
1bae5e1e69b51cda6d67cca8fd9629efa85222cc
Commit Graph

3336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Neutron
8f29c24a0e Merge with master 2012-04-27 18:54:00 +02:00
Romain
8220080554 Merge pull request #49 from nlegoff/fix_tickets 
Fix tickets #605 & #606
 2012-04-27 09:49:47 -07:00
Nicolas Le Goff
b4ce89fad6 merge master 2012-04-27 18:49:38 +02:00
Romain Neutron
2c83c77d9a Fix date Search / Selection / Default sort 2012-04-27 18:39:42 +02:00
Nicolas Le Goff
f8f6c97918 fix #605 consistency deletion of records in order_elements table 2012-04-27 17:41:22 +02:00
Romain
e90761a696 Phraseanet Extension has been updated for PHP 5.4 2012-04-27 18:14:19 +03:00
Romain
7ac0044f64 Merge pull request #46 from romainneutron/Subdefs 
Add device flag for subdefs
 2012-04-27 07:53:58 -07:00
Romain Neutron
093869d3d0 Add devices in API answer / CS / Fixes 
Add tests to media subdefs
Fix CS
Add Mplayer to build
Fix Alchemy\Phrasea\Exceptions
Add media_subdef etags
 2012-04-27 16:46:52 +02:00
Nicolas Le Goff
529452a677 fix command export 2012-04-27 15:53:18 +02:00
Romain
eb3cc646ac Fetch phrasea business fields extension 2012-04-27 14:54:46 +03:00
Romain
77a9e0609b Merge pull request #47 from romainneutron/FixTravis 
Fix travis
 2012-04-27 03:41:39 -07:00
Romain Neutron
8fbce13d21 Convert faac to lib faac 2012-04-27 12:41:16 +02:00
Romain Neutron
7d58149867 Fix build 2012-04-27 12:34:13 +02:00
Romain
a62b9c4079 Remove -j option on compilation 2012-04-27 13:28:41 +03:00
Romain
010d74f23f Merge pull request #37 from romainneutron/FixBuild 
Fix build
 2012-04-27 03:21:46 -07:00
Romain Neutron
47636c4faa Fix build 2012-04-27 12:19:56 +02:00
Romain
7b15cdeec8 Update .travis.yml 2012-04-27 04:52:54 +03:00
Romain
c3ce4e2917 Add Travis build status 2012-04-27 04:29:18 +03:00
Romain
a925d9ce1b Merge pull request #45 from romainneutron/Travis 
Change path for exiftool
 2012-04-26 18:27:51 -07:00
Romain
b8c40069c2 Update .travis.yml 2012-04-27 04:27:13 +03:00
Romain Neutron
66f859479c Change path for exiftool 2012-04-27 03:24:02 +02:00
Romain
85207ad12e Update .travis.yml 2012-04-27 04:04:40 +03:00
Romain
b58efd96b8 Merge pull request #44 from romainneutron/Travis 
Build extension, do not change folder
 2012-04-26 17:56:21 -07:00
Romain Neutron
111af83995 Build extension, do not change folder 2012-04-27 02:55:57 +02:00
Romain
e389b1ee79 Merge pull request #43 from romainneutron/Travis 
Travis
 2012-04-26 17:47:00 -07:00
Romain Neutron
a93fc01c24 Cleanup 2012-04-27 02:46:29 +02:00
Romain Neutron
f7d3bd201f Build on PHP 5.3.2 2012-04-27 02:44:53 +02:00
Romain
1c0067051a Merge pull request #42 from romainneutron/Travis 
Fix composer
 2012-04-26 17:41:55 -07:00
Romain Neutron
6d036abda4 Fix composer 2012-04-27 02:41:34 +02:00
Romain
069a3c60cd Merge pull request #41 from romainneutron/Travis 
add phrasea extension
 2012-04-26 17:35:01 -07:00
Romain Neutron
6e7361e22a add phrasea extension 2012-04-27 02:34:41 +02:00
Romain
12ecc788fd Merge pull request #40 from romainneutron/Travis 
Travis
 2012-04-26 17:26:26 -07:00
Romain Neutron
69deef6039 Fix Sqlite path 2012-04-27 02:25:19 +02:00
Romain Neutron
6e586cb473 add phrasea extension 2012-04-27 02:24:59 +02:00
Romain Neutron
54b4ced88b Cleanup 2012-04-27 02:24:49 +02:00
Romain
b9e990f1b4 Merge pull request #39 from romainneutron/Travis 
Add fixtures for travis
 2012-04-26 17:14:19 -07:00
Romain Neutron
5b49ca397d Add yml conf for travis 2012-04-27 02:12:11 +02:00
Romain Neutron
67eaa6f0fe Add fixtures for travis 2012-04-27 02:08:45 +02:00
Romain
b7fe4dc1d7 Merge pull request #38 from romainneutron/Travis 
Add travis config
 2012-04-26 16:56:51 -07:00
Romain Neutron
f4efd1b144 Add travis config 2012-04-27 01:56:20 +02:00
Romain Neutron
75d34849af Fix build 2012-04-27 01:19:59 +02:00
Romain
84024197aa Merge pull request #35 from nlegoff/601-api_route_info 
#601 api route info
 2012-04-26 13:55:04 -07:00
Romain
1e44471f0a Merge pull request #34 from nlegoff/api_refactor 
Trusted application and password grant_type for oAuth2
 2012-04-26 13:54:46 -07:00
Nicolas Le Goff
d443c12a5a fix coding standard 2012-04-26 19:14:47 +02:00
Nicolas Le Goff
3f81b4a7f4 fix #601 add consistency, add type key, rename install_name -> name 2012-04-26 19:08:08 +02:00
Nicolas Le Goff
61de4aef2c merge 2012-04-26 18:45:43 +02:00
Nicolas Le Goff
90b3870901 add grant_type password for oauth2Client, handle trusted client such as Phraseanet Navigator 2012-04-26 18:23:44 +02:00
Nicolas Le Goff
d07661d80f add NULLABLE for api_applications::id field, create Navigator Oauth2 application,api_applications::client_id field as UNIQ 2012-04-26 14:38:01 +02:00
Nicolas Le Goff
504376389d add section to enable the use of Phraseanet Navigator smartphone application on the current instance 2012-04-26 14:36:00 +02:00
Nicolas Le Goff
9ec4535832 check if oAuth2 client has password grant type enable for password grant_type authentication flow 2012-04-26 14:33:42 +02:00