hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,313 Commits 268 Branches 107 Tags
77d3405149c09a15d0f3d2945c0988a042889c7f
Commit Graph

924 Commits

Author SHA1 Message Date
Thibaud Fabre
1917b3dba3 Merge branch 4.0 into master 2016-05-25 17:21:08 +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
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
ea808d23d7 Tokens should be string, not objects. 2016-05-19 10:53:07 +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
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
Florian BLOUET
5aef71f467 linting 2016-04-14 15:54:44 +02:00
Florian BLOUET
0d362c479e add localization for maps, msic fixes 2016-04-14 15:51:42 +02:00
Benoît Burnichon
4171ab9e8d Rename record_adapter::get_status into getStatus 2016-04-13 19:51:56 +02:00
Benoît Burnichon
7a25b499e3 Deprecated set_binary_status and use setStatus instead. 2016-04-13 18:50:39 +02:00
Jean-Yves Gaulier
1c63194400 PHRAS-1065 #time 1h 
backport PHRAS-947
 2016-04-06 19:10:54 +02:00
Florian BLOUET
68670dd028 add mapBox services into record preview 2016-04-06 17:37:22 +02:00
Florian BLOUET
54d931207a Bump Phraseanet production client 
- Record Editor refacto
 2016-04-01 17:20:48 +02:00
Benoît Burnichon
ff703d5c93 normalize vocabulary service name 2016-03-30 17:53:58 +02:00
Benoît Burnichon
020d7a9b02 Remove VocabularyController 2016-03-30 16:33:10 +02:00
Benoît Burnichon
86cba70a76 Some PHPCS 2016-03-30 14:38:49 +02:00
jygaulier
e2b4d9ec41 Update RecordController.php 2016-03-24 16:01:02 +01:00
Jean-Yves Gaulier
0da3c8112a PHRAS-1045 #time 4h 
-fix : when a story is deleted with "Delete also content..." checked, the content and the story is deleted
 2016-03-24 15:16:15 +01:00
Benoît Burnichon
a547a04aa6 Move Order controllers to same namespace 2016-03-22 16:14:08 +01:00
Benoît Burnichon
a5f9ace717 fix Basket owning setting when providing it 2016-03-22 16:13:22 +01:00
Benoît Burnichon
a0983d39b2 WIP 2016-03-22 16:13:22 +01:00
Benoît Burnichon
f07b7b6722 WIP 2016-03-22 16:13:19 +01:00
Benoît Burnichon
4d65085b46 Extract OrderFiller 2016-03-22 15:55:54 +01:00
Benoît Burnichon
1982d0a625 Prepare extraction of class from OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
cb87d7c0f1 Refactor OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
c394887a19 Move Order controllers to same namespace 2016-03-21 11:22:59 +01:00
Benoît Burnichon
6d086bcb52 fix Basket owning setting when providing it 2016-03-21 11:22:59 +01:00
Benoît Burnichon
2ca47d13f6 WIP 2016-03-21 11:22:59 +01:00
Benoît Burnichon
02829094ce WIP 2016-03-21 11:22:59 +01:00
Florian BLOUET
c632975de3 Fix publication creation, edition, sorting 2016-03-21 09:00:07 +01:00
Florian BLOUET
161bfbe21e remove prod js modules dependencies - remove useless gulp tasks - add phraseanet production client npm module 2016-03-18 10:08:08 +01:00
Florian BLOUET
ea3abbeb54 wip: remove prod js modules dependencies 2016-03-18 10:08:08 +01:00
Florian BLOUET
3011b13049 wip: js modularization of prod and cleanup 2016-03-18 10:08:06 +01:00
Florian BLOUET
83f3bd4084 cleanup move and delete actions 2016-03-18 10:08:05 +01:00
Benoît Burnichon
1587164fe8 SubdefGroup is not array accessible. 
Should use hasser to check whether a group exists or not.
 2016-03-14 17:28:42 +01:00
Benoît Burnichon
f2e62abd8b Remove !count() calls 2016-03-11 18:03:53 +01:00
Benoît Burnichon
b9f1f84020 More deprecation removal 2016-03-06 23:30:12 +01:00
Benoît Burnichon
6cdc9d7a31 Remove some deprecated methods calls 2016-03-06 23:05:55 +01:00
Benoît Burnichon
ba4274eb28 Merge branch '4.0' 2016-03-04 18:11:51 +01:00
Benoît Burnichon
dc0b7c8a14 Add proper typehints in ToolsController 2016-03-04 16:48:49 +01:00
Benoît Burnichon
d9f8270eee Extract OrderFiller 2016-03-02 14:34:50 +01:00
Benoît Burnichon
0a187978bd Prepare extraction of class from OrderController 2016-03-02 14:34:50 +01:00
Benoît Burnichon
1ecc6f7b54 Refactor OrderController 2016-03-02 14:34:50 +01:00
Benoît Burnichon
557c98a9b9 Changes on SubdefGroup reflected in using clients 2016-02-24 13:54:35 +01:00
Jean-Yves Gaulier
1388fcf3de #PHRAS-947 time 4h 
prod/LazaretController uses the manipulator
new route to empty the quarantine
DELETE /api/v2/quarantine/
 2016-02-22 18:06:02 +01:00