hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

97 Commits

Author SHA1 Message Date
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
27ee4334c2 PHRAS-1161_Backport-PHRAS_1100 
#time 30m
 2016-06-15 15:53:14 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Jean-Yves Gaulier
1c63194400 PHRAS-1065 #time 1h 
backport PHRAS-947
 2016-04-06 19:10:54 +02:00
Benoît Burnichon
403eb36903 Demote Admin users on request 2016-02-09 12:25:28 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
60247cd2ad Missing basket persist. 2015-12-22 17:44:34 +01:00
Benoît Burnichon
30b8ec66ed Add API add/remove elements. Change prod basket management 2015-12-22 17:44:34 +01:00
Benoît Burnichon
28650e6a66 Add BasketManipulator to unify internal/external API 2015-12-22 17:44:34 +01:00
Benoît Burnichon
b2ee2668a1 Change to be able to return called API version 2015-12-22 14:19:34 +01:00
Benoît Burnichon
c1e8bb0552 UserManipulator should change login on deletion. 
PHRAS-812
 2015-12-09 13:12:09 +01:00
Benoît Burnichon
f684550ab1 Merge pull request #1555 from bburnichon/rebase-web-gallery-v4 
Rebase web gallery v4
 2015-11-09 17:48:22 +01:00
Jean-Yves Gaulier
bcf8f7d056 PHRAS-773 #time 5h 
added some events to allow port of MT bo-report plugin
 2015-11-03 11:31:19 +01:00
Benoît Burnichon
dc0228ce81 User table does not allow null values. Replace by empty string 2015-10-30 09:06:44 +01:00
Thibaud Fabre
49ec3e0c95 Fix undefined property error 2015-10-12 16:40:28 +02:00
Benoît Burnichon
beabf90fdf Refactor Notifier 2015-05-12 21:05:29 +02:00
Benoît Burnichon
bf27dcff20 Remove useless Dependency 2015-03-27 12:58:07 +01:00
Benoît Burnichon
1342756b84 Rename Controller to ControllerProvider 2015-03-27 12:55:43 +01:00
Benoît Burnichon
e5f48a2f09 Disable ZMQNotifier in setup_mode 2015-03-24 16:06:27 +01:00
Benoît Burnichon
3cc78d769a Extract Proper NotifierInterface in TaskManager 2015-03-24 15:06:20 +01:00
Benoît Burnichon
893f78afa1 Remove call to TaskRepository as not used. 2015-03-24 14:19:29 +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
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
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
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
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
07111a0e1b Add rememberSessionid method 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
00d0a463f8 Fic constant call & improve error message 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
7b85b03d13 Set api version when creating new account 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
2ffcb38985 Use TokenManipulator::LETTERS_AND_NUMBERS instead of old random::LETTERS_AND_NUMBERS 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
8439826db1 Add ApiLog Manipulator 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
f792b0051f Add setRefreshToken method 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
8744227409 Add setCode method 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
9529581f41 Add setOauthToken method 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
56f417a03f Add ApiOauthRefreshToken Manipulator 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
536e54fed7 Add ApiOauthCode Manipulator 2014-03-24 12:28:15 +01:00
Nicolas Le Goff
feca23e1c6 Add OauthToken manipulator 2014-03-24 12:28:15 +01:00