hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 11:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,550 Commits 268 Branches 107 Tags
0dd2bbfb3c49b78fb920d012e707d36c60b85500
Commit Graph

284 Commits

Author SHA1 Message Date
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
f7dfe893b4 Merge branch '3.8' 
Conflicts:
	bower.json
 2013-10-15 19:11:39 +02:00
Romain Neutron
b7d8f777fd Merge pull request #694 from romainneutron/fix-1535 
[3.8] Fix #1535 : API does not display search engine suggestions correctly
 2013-10-15 04:05:30 -07:00
Romain Neutron
eb6eb689e0 Fix #1535 : API does not display search engine suggestions correctly 2013-10-10 18:00:09 +02:00
Romain Neutron
e87aa5afb3 Fix #1524 : API search query is discarded with GET method 2013-10-10 13:39:59 +02:00
Romain Neutron
d716e91169 Merge branch '3.8' 
Conflicts:
	composer.lock
 2013-10-04 15:15:04 +02:00
Nicolas Le Goff
9fc8fbc194 Fix API password grant type authentication 2013-10-03 17:12:46 +02:00
Romain Neutron
1b9a90d635 Fix office plugin class name 2013-10-03 15:24:15 +02:00
Romain Neutron
d294e553d8 Fix office plugin class name 2013-09-30 18:25:41 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
b96c7e8622 Remove chrome frame toggler 2013-09-23 14:11:58 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
391d84ca56 Fix merge 2013-09-17 16:15:44 +02:00
Romain Neutron
e8bf678fc2 Cleanup CS 2013-09-14 02:10:11 +02:00
Romain Neutron
6c7c196a20 Add Office Plugin client id and secret 2013-09-14 02:10:11 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8 
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
 2013-09-14 02:02:56 +02:00
Romain Neutron
3649d89b81 Cleanup CS 2013-09-09 13:31:31 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Andrey
2773075c52 Fixed another typo in adapter 2013-09-05 13:44:12 +02:00
Andrey
1baf81040f Fixed a typo 2013-09-05 13:44:12 +02:00
Andrey
a5cdb65ed6 Removed loadwithuser method 2013-09-05 13:44:12 +02:00
Andrey
c8b62c02db Rebased, fixed codestyle 2013-09-05 13:44:06 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Nicolas Le Goff
75d767333c Move engine query log process from search engine classes to controllers 2013-08-25 13:55:04 +02:00
Nicolas Le Goff
5b0bc8b284 Add recess binary 
Set recess binary to config
 2013-07-12 20:06:32 +02:00
Romain Neutron
242b2c0f71 Remove dependency on convert and composite 2013-07-04 14:10:57 +02:00
Nicolas Le Goff
ab6cf56fd6 Adressed @romainneutron's comments 2013-06-28 16:01:48 +02:00
Romain Neutron
e155089cac Tweaks and fixes 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
01a36ee9f7 Use power of symfony binary file response 
Add commands

Fix typo

Remove extra line
 2013-06-28 00:16:34 +02:00
Romain Neutron
32875e6698 Remove support of binary paths by registry 2013-06-27 12:43:24 +02:00
Romain Neutron
ae89305575 Add better maintenance handling 2013-06-19 19:22:44 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
906d4ba9c5 Localize status bits 2013-06-14 09:47:54 +02:00
Romain Neutron
a7c4739797 Merge pull request #393 from romainneutron/collection-labels-api 
[3.8] Add collection labels to api
 2013-06-14 00:44:51 -07:00
Romain Neutron
d2a50f31b0 Add collection labels to api 2013-06-13 16:15:38 +02:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
c084f20f85 Labelize collections 2013-06-01 01:29:07 +02:00
Romain Neutron
82af1ba69e Add localized labels to databox fields 2013-05-30 18:12:31 +02:00
Romain Neutron
91185e6f3c Fix CS 2013-05-29 21:29:40 +02:00
Romain Neutron
38f38290c8 Fix CS 2013-05-29 21:21:02 +02:00
Romain Neutron
76413165ff Update authentication to service provider 2013-05-29 14:22:51 +02:00
Romain Neutron
6537b96f4c Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
54314f19ac Rename file from 3.7 to master 2013-03-28 16:10:33 +01:00
Romain Neutron
c172ba7bbc Merge branch '3.7' 2013-03-28 14:37:57 +01:00
Romain Neutron
a50541221d Add download URL to API record embed route 2013-03-26 13:21:16 +01:00
Romain Neutron
35c64c6a32 Fix #1128 : Add API timers logs 2013-03-25 19:55:33 +01:00