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
9,042 Commits 268 Branches 107 Tags
d9b1a54e5589bf94c0577a48acedff86dba2eacf
Commit Graph

109 Commits

Author SHA1 Message Date
Benoît Burnichon
feddae6ac7 UserController refactor 2015-04-01 10:23:05 +02:00
Benoît Burnichon
054195d3c0 Finish Lightbox Controller 2015-03-30 14:41:15 +02:00
Benoît Burnichon
9a115726f4 Remove use of LazaretCheck::getMessage() static calls 
LazaretCheck should not perform the translations.

It would be better to have Checker registry to find checker to use.
 2015-03-17 15:59:53 +01:00
Benoît Burnichon
ef7236c3e3 Avoid BC break in User. 
Convert gender to string then back to int after strict check.
The other way does not work as false is considered equal to 0 without strict mode.
 2015-03-13 10:30:56 +01:00
Benoît Burnichon
86cc3550ee in_array should use strict mode for integer checks 2015-03-12 14:40:54 +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
2c2915e58b Fix doctrine schema 2015-03-06 12:51:11 +01:00
Nicolas Le Goff
2c4c1f35fd Set default value 2015-03-06 12:35:18 +01:00
Nicolas Le Goff
5a55732b46 Fix strict mode sql issue 2015-03-06 12:35:18 +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
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
4059f738e7 Typo 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
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
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
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
66fa05f4ee Fix CS 2014-07-17 15:17:04 +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
bf3f870a91 Store UNIX timestamp for token expiration 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
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
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
d09cbbb8cf Add ApiLog Manipulator 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
Nicolas Le Goff
ae25f57330 Remove Session relationship 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
d4ccdfe9b4 Fix mappedBy value for accounts relation 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
a55a266de2 Fix ID genration startegy 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
c4165ab03e Session can be null 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
652b5fb08f Expires can be null 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
6f87cab8c1 Fix annotation issue 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
3ecdd4306b Sets relation beetwen token and account entity to One-To-One Bi-Directional 2014-03-24 12:28:17 +01:00
Nicolas Le Goff
09885d71b5 Add some constant 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
05877e49b8 Add method property 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
3630b942b6 Set oauthToken field length to 32 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
5296601d62 Set scope length to 128 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
a9c0c3a787 Set code length to 16 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
ce90b7c3bf Sets clientId & clientSecret field length to 32 2014-03-24 12:28:14 +01:00
Nicolas Le Goff
0d4bd6ef30 Add accounts property getter 2014-03-24 12:28:14 +01:00
Nicolas Le Goff
60474d618c Add cascade remove for accounts relationship, when deleting an application related accounts will be deleted as well 2014-03-24 12:28:14 +01:00