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

407 Commits

Author SHA1 Message Date
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Thibaud Fabre
5666286e33 Fix typo in api_disable param name 2016-09-28 20:25:25 +02:00
Thibaud Fabre
87a9f532c8 Set extra API settings during provisioning 2016-09-27 11:11:25 +02:00
Thibaud Fabre
888a2b4bb6 Add configuration option to disable SSL requirement on API 2016-05-24 15:38:59 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
fab4491fe5 Fixes default embed-bundle configuration 
PHRAS-1025
 2016-03-02 11:34:07 +01:00
Benoît Burnichon
af25e6bfd8 Remove status table 2015-12-23 14:13:07 +01:00
Benoît Burnichon
30b8ec66ed Add API add/remove elements. Change prod basket management 2015-12-22 17:44:34 +01:00
Benoît Burnichon
6a8a227bc1 Refactor add/remove records from stories 2015-12-22 14:24:32 +01:00
Benoît Burnichon
3a1a39cbd9 Refactor and fixup some bugs in V1Controller 2015-12-22 14:24:32 +01:00
Florian BLOUET
261339ecd5 remove recess, bower, grunt and uglifyJs dependencies in php utils and tests 
updated minifier tests
 2015-12-02 17:36:37 +01:00
Florian BLOUET
82a35ce457 remove useless minifyGroups 2015-12-02 17:35:43 +01:00
Florian BLOUET
ebaf36f2d2 PHRAS-845 - fix close button 
PHRAS-846 - fix admin log view
PHRAS-843 - fix action icons
added white skin
misc fix on skin color handling
replace image icons by fonts icons
 2015-12-02 17:35:42 +01:00
Florian BLOUET
285edaf504 wip - refactoring frontend dependency and build tools - removed deprecated features (client interface) 2015-12-02 17:35:36 +01:00
Benoît Burnichon
488a6f6d24 Use ArrayCache as default caching provider. 
This should speed up tests and also prevent external service dependency
 2015-06-18 12:39:02 +02:00
Benoît Burnichon
43d93eef36 More checks on cache returned values. 
Switched to Redis in tests.
 2015-06-12 12:09:00 +02:00
Jean-Yves Gaulier
fd1f515390 - add route to change cover of a story 
- enhance route to create stories (set cover)
- enhance route to add records to a story (change cover)
- refactor code
todo :
- doc
- better dispatch events (many events for one op)
 2015-05-12 21:42:40 +02:00
Jean-Yves Gaulier
3305329501 report des routes api/story de 3.8 
#time 1.5d
 2015-05-07 16:53:53 +02:00
Benoît Burnichon
31116a14a9 Remove OpCache options as now bundled with PHP5.5+ 2015-05-06 12:00:28 +02:00
Benoît Burnichon
3464a82522 Reduce field size down to 255 utf8 characters 
MySQL count 3 bytes per UTF8 character which makes the index go too large

Remove indexation of appli field which is too wide for MySQL
Remove use of appli index as was deleted
 2015-04-30 16:27:26 +02:00
Benoît Burnichon
5f714b20ef Proper renaming of migrations to comply with doctrine migration convention 2015-03-26 09:57:18 +01:00
Benoît Burnichon
d1ca3fde82 Add correct migrations directory in lib/conf.d 2015-03-26 09:57:18 +01:00
Benoît Burnichon
6d96422ae2 Remove useless tables 2015-03-26 09:57:18 +01:00
Benoît Burnichon
7b832bdda2 Merge pull request #1317 from jygaulier/Aggregation_Limit 
setting for the number of aggregated values (per field)
 2015-03-24 16:12:26 +01:00
Jean-Yves Gaulier
5a08ebb68e change field.aggregable from bool to int -> allows to set the number of aggregation values 2015-03-24 14:43:27 +01:00
Benoît Burnichon
ef68007132 Remove references to Phrasea Indexer. 2015-03-23 18:13:58 +01:00
Benoît Burnichon
c72e31163b Merge remote-tracking branch 'upstream/3.8' 2015-03-13 18:50:49 +01:00
Benoît Burnichon
7734467845 Fix issue with Strict mode 2015-03-13 17:45:48 +01:00
Jean-Yves Gaulier
ff83ee8cb0 minor fix 2015-03-12 17:08:39 +01:00
Mathieu Darse
63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer 
Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js
 2015-03-10 15:25:20 +01:00
Nicolas Le Goff
ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer 
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
 2015-03-10 14:36:31 +01:00
Nicolas Le Goff
4999173467 Merge pull request #1273 from nlegoff/remove-ws 
[3.9] Remove Websockets dependencies
 2015-03-10 11:05:47 +01:00
Nicolas Le Goff
bd4836aaa7 Remove Websockets dependencies 2015-03-10 09:55:43 +01:00
Nicolas Le Goff
5a55732b46 Fix strict mode sql issue 2015-03-06 12:35:18 +01:00
Nicolas Le Goff
5b3e699599 Merge remote-tracking branch 'upstream/3.8' 
Conflicts:
	bower.json
	composer.lock
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/User/Query.php
	lib/classes/patch/320alpha4b.php
	templates/web/admin/statusbit.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/lazaret.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	www/scripts/apps/login/home/config.js
	www/skins/prod/000000/prodcolor.css
	www/skins/prod/959595/prodcolor.css
 2015-02-23 19:16:56 +01:00
Nicolas Le Goff
938a83b967 PHRAS-29 #fix Add creation story in API 2015-02-23 14:44:16 +01:00
Anthony Cabot
6c170e1675 PHRAS-379 #fix enhance default data templates 2015-02-17 15:12:03 +01:00
Nicolas Le Goff
a3ef1b606c Makes static thumbnails delivery as default delivery && set symlink dir in www directory 2015-02-16 15:01:44 +01:00
Nicolas Le Goff
aaf59494cf PHRAS-379 #fix 2015-02-11 18:25:19 +01:00
Nicolas Le Goff
be34fa8877 Fix minify config 2015-02-06 19:33:17 +01:00
Nicolas Le Goff
0eedf67da8 Fix minify configuration 2015-02-06 19:16:15 +01:00
Nicolas Le Goff
5a62787b85 Fix geonames amd loading 2015-02-06 16:04:18 +01:00
Nicolas Le Goff
00d49cd74c Fix autobahn js dependency 2015-02-06 14:16:44 +01:00
Nicolas Le Goff
d82adbf109 Bump year to 2015 2015-01-20 14:08:25 +01:00
Nicolas Le Goff
9f38823f27 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
 2014-12-09 13:59:29 +01:00
Nicolas Le Goff
6f7b3c9b46 Remove unused table log_thumb 2014-11-21 10:37:33 +01:00
Mathieu Darse
9b02b90353 Fix engine type in default configuration 2014-11-10 15:17:22 +01:00
Nicolas Le Goff
28eecf6a09 Merge branch '3.8' 
Conflicts:
	.gitignore
	bin/console
	composer.json
	composer.lock
	hudson/fixtures.sql
	lib/Alchemy/Phrasea/Command/Developer/IniReset.php
	lib/Alchemy/Phrasea/Command/Setup/Install.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Setup/Upgrade.php
	lib/classes/media/subdef.php
	lib/classes/task/period/RecordMover.php
	templates/web/prod/index.html.twig
	templates/web/setup/step2.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/db-ref.sqlite
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
 2014-10-09 19:40:33 +02:00
Nicolas Le Goff
df013d4f21 Allow to specify symlink directory 2014-09-10 11:25:31 +02:00
Nicolas Le Goff
e72a8ebda3 Update configuration 2014-09-10 11:24:43 +02:00