hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,757 Commits 268 Branches 107 Tags
ed3ffb59a68bfbc9f95d0285d1f54703c6e7716f
Commit Graph

203 Commits

Author SHA1 Message Date
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
111755fa9b Refactor status display 2015-02-19 15:14:23 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
065f64bd47 Report previous patches 2015-02-09 13:42:26 +01:00
Nicolas Le Goff
40da069bf3 Fix tests 2015-02-06 20:03:33 +01:00
Nicolas Le Goff
b2dad6c18a Fix SQL queries 2015-02-06 17:01:49 +01:00
Nicolas Le Goff
33fc12e09e Remove strict comparison 2015-02-06 16:17:26 +01:00
Mathieu Darse
1f1264ba54 Merge pull request #9 from nlegoff/flags 
Add flags property
 2014-12-29 11:34:21 +01:00
Nicolas Le Goff
1763ba5934 Add collection name 2014-12-26 15:26:03 +01:00
Nicolas Le Goff
fc7221fdbc Add flags property 2014-12-26 15:06:30 +01:00
Nicolas Le Goff
088b0672cb Fix latest merge 2014-12-15 11:40:30 +01:00
Nicolas Le Goff
4059f738e7 Typo 2014-12-04 11:48:12 +01:00
Nicolas Le Goff
552bb88d4e Add exif method to record interface 2014-12-04 11:48:12 +01:00
Nicolas Le Goff
8e2d9a57c4 Fix feed entry item order 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
b7c428f71f Fix minor issues 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
4d76f374e1 Fix mistake 2014-12-04 11:48:10 +01:00
Nicolas Le Goff
15a03f647d Update according to @mdarse comments 2014-12-04 11:48:09 +01:00
Nicolas Le Goff
1dddcbd3c6 Handle substitution 2014-12-04 11:48:09 +01:00
Nicolas Le Goff
392ff21d51 Clean 2014-12-04 11:48:08 +01:00
Nicolas Le Goff
604416f214 Fix namespaces & method call 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
d5fb2e1cb9 Update Record Hydration 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
e3e7201700 Update Record Interface 2014-12-04 11:48:07 +01:00
Nicolas Le Goff
eb67f67c95 Add ESRecordENtity 2014-12-04 11:48:06 +01:00
Nicolas Le Goff
957f314a07 Delete Record Entities 2014-12-04 11:48:06 +01:00
Nicolas Le Goff
3f79f8f548 Add dumn entity hydrator 2014-12-04 11:48:04 +01:00
Nicolas Le Goff
f3f472b0c1 Add record Entity 2014-12-04 11:48:04 +01:00
Nicolas Le Goff
01516a5dc0 Add new RecordInterface 2014-12-04 11:48:04 +01: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
66fa05f4ee Fix CS 2014-07-17 15:17:04 +02:00
Nicolas Le Goff
24b885eb7c Fix tests 2014-07-03 15:07:35 +02:00
Nicolas Le Goff
1970439edb Fix latest merge 2014-06-24 16:40:12 +02:00
Nicolas Le Goff
0d040519f3 Add third party application webhook event 2014-06-23 17:48:42 +02:00
Nicolas Le Goff
1250f8ab0b Fix latest merge 2014-06-19 16:11:27 +02:00
Nicolas Le Goff
b92370cca2 Merge pull request #1021 from nlegoff/api-doctrine 
[READY][3.9] Transform api_* tables to doctrine entities
 2014-06-13 14:13:23 +02:00
Nicolas Le Goff
1054483ae9 Fix latest merge 2014-03-30 21:17:46 +02:00
Nicolas Le Goff
bf3f870a91 Store UNIX timestamp for token expiration 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
dce9269d86 Add setLastused function to OauthTokenManipulator 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
9de0dd41dc Fix uri detection for oauth code 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
23eff56046 Add bi-directional reloationship for application to account & accout to tokens 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
6b50ee15a7 Add tests 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
448baa8484 Checks id url is legal 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
2ed65f2461 Expires can be null 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
46124df500 Remove unique index on account_id 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
178da6a3a6 Fix tests 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
63b6de5fc8 Remove one to one relation beetween account and token & add lastUsed field for token 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
8fc7ec3714 Fix infinite loop 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
d09cbbb8cf Add ApiLog Manipulator tests 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
03d19262b6 Fix token generation 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
c00c10822e Add ApiAccountManipulator tests 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
bf5b02a583 Sets api tokens fields length to 128 for migration purpose 2014-03-24 12:29:37 +01:00