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

3071 Commits

Author SHA1 Message Date
Nicolas Le Goff
d5531ce8b2 Fix Migration 2014-11-24 17:03:28 +01:00
Nicolas Le Goff
4b5a1d79fb Fix etags calculation 2014-11-21 14:55:10 +01:00
Nicolas Le Goff
68af5b3391 Returns 304 http code if images are not modified 2014-11-21 10:36:52 +01:00
Nicolas Le Goff
31938f23c7 Get logs from deleted records as well 2014-11-21 09:24:44 +01:00
Nicolas Le Goff
e2267d4f1c Fix download report 2014-11-21 09:20:42 +01:00
Nicolas Le Goff
af78aae182 PHRAS-335 #fix dashboard & downloads query 2014-11-19 17:40:02 +01:00
Nicolas Le Goff
2000f4116f Fix tests 2014-11-19 14:50:08 +01:00
Nicolas Le Goff
7d44a356e3 CUS-120 #fix editon date for records 2014-11-18 17:47:33 +01:00
Nicolas Le Goff
52b9850add Fix tests 2014-11-18 14:36:50 +01:00
Nicolas Le Goff
13759a6c86 PHRAS-289 #fix action are for push and validation are inverted 2014-11-17 16:52:26 +01:00
Nicolas Le Goff
6a8b79be45 PHRAS-335 #fix date mismatching in report 2014-11-17 16:50:20 +01:00
Nicolas Le Goff
d47df2418b PHRAS-335 #fix date mismatching 2014-11-17 12:09:01 +01:00
Nicolas Le Goff
0b763c459e PHRAS-342 #fix remove usr list when user is deleted 2014-11-17 11:46:28 +01:00
Nicolas Le Goff
2c59cdd3dd Merge pull request #1182 from jygaulier/REPORT-VU 
Report-VU : fix collection selection, date selectors, csv, ...
 2014-11-07 12:10:02 +01:00
Nicolas Le Goff
d7b8a67ac3 Remove references to collection filter 2014-11-05 12:57:48 +01:00
Jean-Yves Gaulier
a353dc4de6 Report-VU : fix tests 2014-11-03 12:24:38 +01:00
Jean-Yves Gaulier
6a1e161701 Report-VU : fix collection selection, date selectors, csv, ... 
disabled log
 2014-10-30 18:54:06 +01:00
Nicolas Le Goff
3f26c2161d Fix status bit offset 2014-10-29 16:55:33 +01:00
Nicolas Le Goff
f695f4ec37 Force free memory 2014-10-20 10:06:04 +02:00
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +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
130591e372 Merge pull request #1173 from nlegoff/api-version 
[3.8.6] Update API version
 2014-10-09 16:58:28 +02:00
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-10-06 18:24:58 +02:00
Jean-Yves Gaulier
90e611de81 fix PHRAS-306 #time 6h 
NB: can be set now, but will work only when PHPExiftool will be patched with the "copy" method (PR done).
 2014-10-01 19:52:17 +02:00
Nicolas Le Goff
68fc8f660e Update API version 2014-10-01 12:37:30 +02:00
Nicolas Le Goff
6087ee3fb4 Merge pull request #1172 from nlegoff/fix-patch 
[3.8] Fix patch migration && advanced search issues
 2014-10-01 11:45:05 +02:00
Nicolas Le Goff
4318b0e0b5 Fix patch migration 2014-09-30 16:58:35 +02:00
Nicolas Le Goff
a6c411f404 Fix sql to get created client apps 2014-09-30 16:15:45 +02:00
Nicolas Le Goff
75334ad2bf PHRAS-295 #fix unmount databse cache 2014-09-25 15:45:22 +02:00
Nicolas Le Goff
a7b59b84c7 Merge pull request #1091 from nlegoff/yeah-yeah-yeah 
[3.8.6][PHRAS-136] Add static file mode to serve thumbnails
 2014-09-24 14:07:06 +02:00
Jean-Yves Gaulier
4f1faac99b fix PHRAS-293 #time 2h 2014-09-22 19:00:23 +02:00
Jean-Yves Gaulier
c962af8962 PHRAS-5 #time 1h 
prevent editing to clear the "make_subdef" jeton
 2014-09-17 12:26:37 +02:00
Jean-Yves Gaulier
6ce84ecc1c PHRAS-5 #time 1h 
prevent editing to clear the "make_subdef" jeton
 2014-09-17 12:23:45 +02:00
Nicolas Le Goff
5994dba2dc Check if application exists 2014-09-10 20:40:32 +02:00
Nicolas Le Goff
0aa1ff2e22 Minor fixes 2014-09-10 18:57:35 +02:00
Nicolas Le Goff
b192d46626 Generate xml file when installing or updgrading application 2014-09-10 18:57:31 +02:00
Nicolas Le Goff
f047878f36 bump to version 3.8.6-alpha3a 2014-09-10 11:29:08 +02:00
Nicolas Le Goff
9ba9533925 Fix github comments 2014-09-10 11:25:31 +02:00
Nicolas Le Goff
f27b960eeb Remove links when unmounting db 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
4dcd0b85fb Add patch 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
2c6ba6b99f Add static file mode to deliver thumbnails 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
2ad315cfb2 Set User_Query object as a service 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
98cf87557b Bump to version 390-alpha20 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
Jean-Yves Gaulier
4441eae4a5 PHRAS-64 #time 1h 
fix "subdefs to be done" in admin/base
 2014-09-09 11:23:23 +02:00
Jean-Yves Gaulier
752f0d5da4 PHRAS-64 #time 1h 
show progression number (records to do) for subdef task
 2014-09-09 11:23:23 +02:00
Nicolas Le Goff
b2cfc55af8 Merge pull request #1155 from nlegoff/rebased-PHRAS-270 
[3.8][PHRAS-270] Fix metadata rewriting
 2014-09-09 11:22:10 +02:00