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

849 Commits

Author SHA1 Message Date
Thibaud Fabre
9ff43945ba Fix merge errors 2016-12-06 14:04:38 +01:00
Thibaud Fabre
23c939f13c Merge master 2016-12-05 17:48:19 +01:00
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
Thibaud Fabre
d00d674cdf Fix document substitution 2016-11-24 17:21:11 +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
Thibaud Fabre
cdc410191c Merge pull request #1960 from jygaulier/PHRAS-1192_quarantaine-by-filenames_4.0 
PHRAS-1192_quarantaine-by-filenames_4.0
 2016-09-29 14:11:08 +02:00
Thibaud Fabre
73826d535c PHRAS-1248 Merge branch '4.0' 
Conflicts:
	Makefile
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Collection/CollectionService.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php
	lib/classes/record/adapter.php
	resources/ansible/roles/app/tasks/main.yml
	resources/www/prod/js/jquery.Edit.js
	resources/www/prod/js/jquery.main-prod.js
	resources/www/prod/skins/ui-components/_answers-tools.scss
	templates/web/common/dialog_export.html.twig
	templates/web/prod/thesaurus.js.twig
 2016-09-28 19:52:33 +02:00
Jean-Yves Gaulier
837a294827 PHRAS-1192_quarantaine-by-filenames_4.0 
- add : quarantine thumbnails looks like result thb (zoom, caption, infos, ...) by using the same template
 - removed : some code about highlighting titles
 - fix : double extension on exported files
 2016-09-28 13:16:10 +02:00
Jean-Yves Gaulier
827e4fe255 PHRAS-842_search-logged-as-es_4.0 
- fix : query is logged in a "user" form, before parsing
 2016-09-22 15:16:36 +02:00
Jean-Yves Gaulier
1c1e9cf723 PHRAS-1216_story-cover-changed-event 
- fix : class name/extend changed,
#time 10m
 2016-09-21 15:47:55 +02:00
Jean-Yves Gaulier
e10971a88f PHRAS-1216_story-cover-changed-event 
#time 1h
 2016-09-21 15:13:12 +02:00
Florian BLOUET
75b172b7cf Bump Phraseanet Production Client 
update video tools features
- add sequencial hotkey for play speed: (L) (LL) (LLL...)
 2016-07-08 15:30:37 +02:00
Florian BLOUET
3258d91f73 Bump Phraseanet Production Client 
update video tools features
- add keyboard shortcuts: move up/down ranges in list
- fix loop if end range match the end of the video
- fix play/pause race condition
 2016-07-08 12:12:25 +02:00
Florian BLOUET
6774f5cd9e Bump Phraseanet Production Client 
update video tools features, fix misc issues
    - fix pym.js integration issues
    - fix record editor's preview tab
    - add video Editor in record Editor
    - export VTT content to VideoTextTrack field
 2016-07-06 13:45:15 +02:00
Florian BLOUET
7534e26661 Bump Phraseanet Production Client 
update video tools features
- add range reordering via drag n drop
- add configurable rewind/forward steps
 2016-06-30 11:31:48 +02:00
Florian BLOUET
406f7d1182 add video tools translations 2016-06-30 11:31:14 +02:00
Florian BLOUET
94b69af4ba clean and fix recordController 2016-06-17 15:33:14 +02:00
Florian BLOUET
1412f98071 add pym.js iframe communication lib for embed bundle 
- bump embed-bundle
- bump phraseanet-production-client
 2016-06-17 10:41:26 +02:00
Jean-Yves Gaulier
9e891d4ae9 PHRAS-1164_Backport-PHRAS-1158-to-4.0 
#time 20m
 2016-06-16 16:02:26 +02:00
Jean-Yves Gaulier
51ff2e040a PHRAS-1158_STAMP-CHANGE-COLL 
fix : the stamp was not updated when a record changed of collection
#time 2h
 2016-06-16 13:54:45 +02:00
Thibaud Fabre
fab4a6e6d5 Fix incorrect file names for filename containing dots 2016-06-13 18:57:23 +02:00
Florian BLOUET
0ade016f14 updated css theme switch 2016-06-02 14:27:20 +02:00
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