hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,373 Commits 268 Branches 107 Tags
552bb88d4eba05e15ec03f55c8014f706958c38d
Commit Graph

1275 Commits

Author SHA1 Message Date
Nicolas Le Goff
e9c6d1a56e Fix mess in prod (record & feed) templates 2014-12-04 11:48:11 +01:00
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +02:00
Mathieu Darse
85102bfce7 Merge remote-tracking branch 'upstream/master' 2014-10-15 12:14:08 +02:00
Damien Alexandre
f196155049 Fix PHRAS-322, add result debug informations (aggregations) 2014-10-14 18:51:02 +02:00
Damien Alexandre
2f890bcf49 Oups, debug code 2014-10-13 19:17:53 +02:00
Damien Alexandre
403c83b462 Fix indexing single record on post upload 2014-10-13 19:17:20 +02:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02: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
26617ba5cc PHRAS-262 #fix remove postlog feature for guest access 2014-10-08 20:18:49 +02:00
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-10-06 18:24:58 +02:00
Damien Alexandre
2c9bd86d2a Merge remote-tracking branch 'upstream/master' 2014-10-06 18:23:23 +02:00
Damien Alexandre
e8ac0df198 Merge branch 'master' of github.com:mdarse/Phraseanet 2014-10-06 18:22:56 +02:00
Nicolas Le Goff
69260ac7c7 Remove guest access check for export controller 2014-09-25 12:43:02 +02:00
Nicolas Le Goff
cff6db83f7 Fix connection to database detection in install process 2014-09-23 13:30:31 +02:00
Damien Alexandre
35be34db50 Merge remote-tracking branch 'origin/master' into elastic-indexer 2014-09-22 11:59:11 +02:00
Mathieu Darse
e6d159d6ec Merge pull request #3 from mdarse/query-parser 
Query parser first implementation
 2014-09-22 11:50:17 +02:00
Nicolas Le Goff
1a35ef0874 PHRAS-287 #fix add missing post.auth event after authentication via OAUTH 2014-09-18 15:24:49 +02:00
Nicolas Le Goff
2ad315cfb2 Set User_Query object as a service 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
7c62038b7d Fix unit tests 2014-09-09 21:21:38 +02:00
Romain Neutron
c4bf6c3c67 Convert custom events to symfony events 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
ab73febefd Fix users right 2014-09-09 20:05:57 +02:00
Nicolas Le Goff
7eb1a506fa Merge branch '3.8' 
Conflicts:
	.gitignore
	.travis.yml
	Vagrantfile
	lib/Alchemy/Phrasea/Controller/Datafiles.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/classes/connection/pdo.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.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/setup/step2.html.twig
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt
 2014-09-09 15:05:13 +02:00
Nicolas Le Goff
9c4e098bb6 PHRAS-272 #fix database connection if no database provided 2014-09-08 23:37:30 +02:00
Nicolas Le Goff
2e6c11a9ed Update travis 2014-09-08 22:23:00 +02:00
Damien Alexandre
91bbb5a1bd Fix thesaurus ACL getter, ping @nlegoff 2014-09-08 16:28:27 +02:00
Nicolas Le Goff
0e807b2b0f Add aggregable property to metadata fields 2014-09-08 14:53:23 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00
Nicolas Le Goff
fc2f49d012 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/record/adapter.php
	lib/classes/task/period/subdef.php
	templates/web/prod/thesaurus.js.twig
	tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/connectionTest.php
 2014-09-02 19:09:38 +02:00
Jean-Yves Gaulier
415ec0d7a0 speedup hit compute (green digits in prod/thesaurus) 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6e9c6d9480 clean 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
31401364f0 speedup occurences calc 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6fbe66829c phras-36 #time 4h 
first proto, wip do not merge
 2014-09-02 13:44:36 +02:00
Nicolas Le Goff
d2ff7b8c26 PHRAS-114 #fix Add candidate in thesaurus 2014-08-26 17:23:32 +02:00
Nicolas Le Goff
b9bb9f5f0e Merge branch '3.8' 
Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig
 2014-08-26 13:38:01 +02:00
Mathieu Darse
1fbddfec3e PoC query parser 
With Jison PHP port
 2014-08-25 10:25:37 +02:00
Nicolas Le Goff
6485b64e68 Fix latest merge 2014-08-20 15:13:41 +02:00
Jean-Yves Gaulier
33b8451978 PHRAS-64 #time 1,5j 
delete progress bars for tasks / add subdefs stats for base
 2014-08-20 14:06:18 +02:00
Nicolas Le Goff
353d625f9a Fix latest merge 2014-08-19 14:59:48 +02:00
Nicolas Le Goff
81763db182 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Helper/Record/Helper.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/caption/record.php
	lib/classes/registry.php
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
 2014-08-19 12:17:18 +02:00
Nicolas Le Goff
bef7fa836e Merge pull request #1130 from nlegoff/right-apis 
[READY][3.8.6] Apply user rights on sub-definition
 2014-08-19 11:50:11 +02:00
Nicolas Le Goff
8a55a2c1ed Fix latest merge 2014-08-19 11:49:35 +02:00
Nicolas Le Goff
779c29dd16 Allow to rotate thumbnails on all type of records 2014-08-19 11:45:19 +02:00
Nicolas Le Goff
2328bc772d Fix PDF generation for print 2014-08-19 11:43:16 +02:00
Nicolas Le Goff
33d6a34f26 Fix PHRAS-146 Order of a basket generates an error when the content comes from two different collections 2014-08-19 11:41:11 +02:00
Nicolas Le Goff
2d0a2bc353 Merge pull request #1100 from nlegoff/fix-146 
[READY][3.8.6][PHRAS-146] Order of a basket generates an error when the content come...
 2014-08-18 10:50:36 +02:00
Nicolas Le Goff
ab80bd454b Merge pull request #1107 from nlegoff/fix-phras-111 
[READY][3.8.6][PHRAS-111] Allow rotation for image subdef
 2014-08-18 10:50:09 +02:00
Nicolas Le Goff
095371fa05 Merge pull request #1110 from nlegoff/fix-phras-153 
[READY][3.8.6][PHRAS-153] Fix printing PDF generation
 2014-08-18 10:48:49 +02:00
Nicolas Le Goff
fe6bdb21b2 Allow to rotate thumbnails on all type of records 2014-08-13 18:23:40 +02:00
Nicolas Le Goff
8196c2720e Fix tests 2014-08-13 18:06:54 +02:00
Nicolas Le Goff
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00