hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,482 Commits 268 Branches 107 Tags
944f78fbf60e7ac7064264d20d096d92247181ea
Commit Graph

2095 Commits

Author SHA1 Message Date
Thibaud Fabre
cd530b4696 Fix merge failure in V1Controller 2016-05-25 17:40:10 +02:00
Thibaud Fabre
1917b3dba3 Merge branch 4.0 into master 2016-05-25 17:21:08 +02:00
Thibaud Fabre
a2ae899121 PHRAS-573 Add status rights in /me response 2016-05-25 14:08:34 +02:00
Thibaud Fabre
bf08667d0d PHRAS-572 List user rights by databox in /me route 2016-05-25 11:57:03 +02:00
Thibaud Fabre
9008561891 Merge pull request #1882 from aztech-dev/fix/application-settings-access 
Restrict application settings access to application owner
 2016-05-24 18:17:48 +02:00
Thibaud Fabre
010b7b7be2 Restrict application settings access to application owner 2016-05-24 17:45:38 +02:00
Thibaud Fabre
f4d71eeb63 Display unique collection IDs in collection admin 2016-05-24 17:30:02 +02:00
Thibaud Fabre
888a2b4bb6 Add configuration option to disable SSL requirement on API 2016-05-24 15:38:59 +02:00
Thibaud Fabre
e37437084b Merge pull request #1877 from aztech-dev/fix/api-order-download 
Fix archive path when downloading orders via API
 2016-05-24 11:52:05 +02:00
Thibaud Fabre
cf684cdeca Fix archive download via API 2016-05-23 17:54:40 +02:00
Thibaud Fabre
b96917f908 Merge pull request #1831 from bburnichon/improvement/search 
Search API
 2016-05-23 14:17:25 +02:00
Florian BLOUET
91bfa11754 PHRAS-851 - add databox name, collection name and logo to record title in preview 
Bump Phraseanet Production Client
 2016-05-23 11:52:35 +02:00
Florian BLOUET
b7a3571d04 PHRAS-851 - add databox name, collection name and logo to record title in preview 2016-05-23 11:36:25 +02:00
Benoît Burnichon
2d60fe854e str_replace / by _ in labels of permalinks 2016-05-20 17:19:46 +02:00
Benoît Burnichon
9d77c31c99 Make some list Methods private and remove unused one. 2016-05-19 13:53:40 +02:00
Benoît Burnichon
d4855ebb27 Add TraceableArraySerializer to be able to debug calls 2016-05-19 13:53:40 +02:00
Benoît Burnichon
5edf7b7984 Use RecordCollection as it filters out missing records 2016-05-19 13:50:08 +02:00
Benoît Burnichon
67b27650b4 Use same init process in searchRecordsAction and searchAction 2016-05-19 13:50:08 +02:00
Benoît Burnichon
148568080f Bump fractal version to development one. 2016-05-19 13:50:08 +02:00
Benoît Burnichon
e995085fd6 Add some fractal utility classes 2016-05-19 13:44:01 +02:00
Benoît Burnichon
71b370f766 Fixup calls order to avoid N+1 2016-05-19 13:44:01 +02:00
Benoît Burnichon
7e9e34a87d Subscriber is on DataRepository not actual repository 2016-05-19 13:44:01 +02:00
Benoît Burnichon
f87fc35f6a Caption Service tweak 2016-05-19 13:44:01 +02:00
Benoît Burnichon
7aa499716b Add Caption Service and Repositories 2016-05-19 13:44:01 +02:00
Benoît Burnichon
72d4647d11 WIP progress on List Records 2016-05-19 13:44:01 +02:00
Benoît Burnichon
126b83ec7c WIP RecordTransformer 2016-05-19 13:44:01 +02:00
Benoît Burnichon
24143759a7 WIP 2016-05-19 13:44:01 +02:00
Benoît Burnichon
e2e1fb0e09 Change Api SearchController to use Fractal 2016-05-19 13:44:01 +02:00
Benoît Burnichon
ea808d23d7 Tokens should be string, not objects. 2016-05-19 10:53:07 +02:00
Benoît Burnichon
96fce57ae3 Make some list Methods private and remove unused one. 2016-05-18 11:46:10 +02:00
Benoît Burnichon
ee9c766fa1 Add TraceableArraySerializer to be able to debug calls 2016-05-18 11:41:46 +02:00
Benoît Burnichon
33ec01a2c8 Use RecordCollection as it filters out missing records 2016-05-16 19:35:26 +02:00
Benoît Burnichon
99a23a0753 Use same init process in searchRecordsAction and searchAction 2016-05-16 19:34:45 +02:00
Benoît Burnichon
df0aee31a0 Bump fractal version to development one. 2016-05-16 18:26:17 +02:00
Benoît Burnichon
3139fccecc Add some fractal utility classes 2016-05-13 16:54:30 +02:00
Benoît Burnichon
b61a8a7418 Fixup calls order to avoid N+1 2016-05-12 16:07:09 +02:00
Benoît Burnichon
9f615dfb5d Subscriber is on DataRepository not actual repository 2016-05-12 16:07:09 +02:00
Benoît Burnichon
2341641c9e Caption Service tweak 2016-05-12 16:07:09 +02:00
Benoît Burnichon
ae4d46216f Add Caption Service and Repositories 2016-05-12 16:07:09 +02:00
Benoît Burnichon
23eff5fe28 WIP progress on List Records 2016-05-12 16:07:09 +02:00
Benoît Burnichon
0030e51561 WIP RecordTransformer 2016-05-12 16:07:09 +02:00
Benoît Burnichon
0832343c66 WIP 2016-05-12 16:07:09 +02:00
Benoît Burnichon
0474703d62 Change Api SearchController to use Fractal 2016-05-12 16:07:09 +02:00
Florian BLOUET
0eada5fbe1 enable/disable geolocalized search button if providers available - add npm run dev command 2016-05-11 11:13:47 +02:00
Benoît Burnichon
ca6c3f9920 Changes on SubdefGroup reflected in using clients 2016-04-22 12:42:14 +02:00
Benoît Burnichon
b05f9caf6c Merge branch '4.0' into merge-4.0 2016-04-21 13:27:10 +02:00
Benoît Burnichon
3ca3019668 Wipe record ids out of API search response 
Fix PHRAS-1085
 2016-04-21 11:15:38 +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
Thibaud Fabre
4bd220c6e7 Merge pull request #1809 from bburnichon/improvement/search 
Add caching of all subdefs of a record
 2016-04-18 11:21:30 +02:00
Benoît Burnichon
033542ac2f Remove some arguments from query and add them to options 2016-04-15 16:36:28 +02:00