hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,146 Commits 268 Branches 107 Tags
PHRAS-4131-set-order-add-loader
Commit Graph

40 Commits

Author SHA1 Message Date
Aina Sitraka
b8786852e0 PHRAS-4067: admin - dashboard - 500 error (#4513) 
* fix error 500 on dashboard : remove unused swiftools requirement

* unused

* patch on 4.1.8
 2024-06-10 18:18:34 +02:00
jygaulier
2ee51887e0 PHRAS-3789 add auto-connect-idp-name option (#4194) 
patch to add missing options to conf
 2022-12-13 19:43:50 +01:00
jygaulier
7e7435469d PHRAS-2995_phr-as-auth-idp-BIS (#4180) 
* WIP ; allow multiple instances of some auth clients (migrate conf) ; add ps-oauth ; remove google+

* WIP ; fix ps-oauth ; fix tests

* WIP ; add api-auth to extra_hosts

* WIP ; fix yaml syntax error

* WIP ; fix yaml syntax error ; better conf sample

* WIP ; add "everyone-group"

* WIP ; add the provider-id in session

* WIP ; add getOptions() to providers (so phr/expose can filter providers)

* WIP ; add auto-logout option so logout from phr also logouts from ps-auth

* connect to expose using IDP from connected user

* WIP ; auto-logout redirects to phr home

* unnecessary session var

* unused

* fix

* catch some error

* fix navigation in train thumbnail

* update file version

* pass params in session to have constant redirect_uri ; add debug

* invalidate session --> parade test ok

* cleanup
 2022-12-01 16:27:54 +01:00
aynsix
baf22aae86 change key name 2020-08-06 16:14:17 +03:00
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +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
0057cccdfe ansible WIP 2016-05-16 14:45:42 +02: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
Benoît Burnichon
abbb4b0120 Remove Grunt and install-assets steps 2015-12-02 17:35:42 +01:00
Benoît Burnichon
408e350b2e PHPCS and add blackfire bash aliases 2015-07-10 11:56:16 +02:00
Benoît Burnichon
be320ea7a2 Bump elasticsearch version to 1.6.0 2015-07-08 12:07:32 +02:00
Benoît Burnichon
f83d300bf5 Add python-meld3 to vagrant package list 2015-06-18 12:19:52 +02:00
Benoît Burnichon
1bb6e78868 Properly stop iptables. 2015-06-05 12:39:03 +02:00
Benoît Burnichon
cc6c5ad26d Disable marvel agent to avoid filling vm with logs. 2015-05-20 16:15:31 +02:00
Benoît Burnichon
f8270f5c5a change cpu count down to 2 in vagrant 2015-05-06 12:00:29 +02:00
Benoît Burnichon
31116a14a9 Remove OpCache options as now bundled with PHP5.5+ 2015-05-06 12:00:28 +02:00
Thibaud Fabre
28655ecbda Rename resources 2015-04-17 10:04:02 +02:00
Thibaud Fabre
e7469af284 Use correct script for API location 2015-04-17 09:59:23 +02:00
Benoît Burnichon
651d412055 Improve vagrant box generation 2015-04-07 16:03:01 +02:00
Benoît Burnichon
ef68007132 Remove references to Phrasea Indexer. 2015-03-23 18:13:58 +01:00
Benoît Burnichon
e5fae798dc Properly install zmq pecl extension in vagrant. Create default test dbs 2015-03-17 11:31:14 +01:00
Benoît Burnichon
7ad443a88b Upgrade php from 5.4.* to 5.5.* 2015-03-17 10:09:07 +01:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22: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
d431c16a0d Merge pull request #1261 from bburnichon/feature/install-fixes 
Fixup installation process
 2015-03-04 19:35:57 +01:00
Benoît Burnichon
587e89af2f Change locale to use the english one. 2015-03-04 17:30:04 +01:00
Benoît Burnichon
a680e8b817 Add memcached and zip debian packages. 2015-03-04 17:29:41 +01:00
Benoît Burnichon
2e74467c79 add vagrant dir to ignored, increase vm memory to 4G 2015-03-04 16:33:59 +01:00
Benoît Burnichon
b651d32a4c Remove old .bowerrc copy. 2015-03-03 17:40:18 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Damien Alexandre
b303de15d7 Add marvel to the provisionning (useful for the Sense query tool) 2014-11-07 11:29:49 +01:00
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +02:00
Damien Alexandre
da036f5b21 Remove mongodb from the services in the VM 
You will have to remove manualy /var/lib/mongodb/journal/*
to save space on the VM.
 2014-10-13 13:26:02 +02:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-10-06 18:24:58 +02:00
Damien Alexandre
e31b138e2f Set back the logger on Elasticsearch client, not pleased with the format 2014-09-22 11:34:14 +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
233940d113 Improve VM build 2014-09-08 16:35:58 +02:00
Damien Alexandre
1d4a546d90 Provisioning: add ICU plugin and update Elasticsearch version 2014-09-08 12:48:32 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00