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

12001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaud Fabre
be4846c8aa Merge pull request #1942 from alchemy-fr/backport/provisioning 
Backport provisioning
 2016-09-22 12:03:23 +02:00
Thibaud Fabre
494f48c053 Split make targets and update provisioning accordingly 2016-09-22 11:53:06 +02:00
Thibaud Fabre
1d45621b2d Merge pull request #1943 from alchemy-fr/fix/asset-provisioning 
Split make targets and update provisioning accordingly
 2016-09-22 11:52:24 +02:00
Thibaud Fabre
bfcfa591da Split make targets and update provisioning accordingly 2016-09-22 11:51:54 +02:00
Thibaud Fabre
770d38b754 Install dependencies and public assets during initial provisioning 2016-09-22 10:10:31 +02:00
Thibaud Fabre
dc6cddcd26 Fix Ansible roles to provision fully functional Vagrant VM 2016-09-22 10:10:08 +02:00
Thibaud Fabre
01cbec3048 Install dependencies and public assets during initial provisioning 2016-09-21 16:54:20 +02:00
Thibaud Fabre
4f6a062a69 Merge pull request #1940 from alchemy-fr/fix/vagrant-provisionning 
Fix Vagrant provisionning
 2016-09-21 16:50:03 +02:00
Thibaud Fabre
4da8a25e26 Fix Ansible roles to provision fully functional Vagrant VM 2016-09-21 16:49:15 +02:00
Thibaud Fabre
d934e04c80 Merge pull request #1938 from jygaulier/PHRAS-1216_story-cover-changed-event 
PHRAS-1216_story-cover-changed-event
 2016-09-21 16:11:56 +02:00
Thibaud Fabre
fe3bae5201 Merge pull request #1939 from alchemy-fr/backport/validation-tokens 
Fix non unique validation tokens
 2016-09-21 16:02:39 +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
Thibaud Fabre
4a434672b4 Remove limit clause and use maxResults query method 2016-09-21 15:17:27 +02:00
Thibaud Fabre
e9f74c9c52 Fix login issues when multiple validation tokens exist 2016-09-21 15:17:18 +02:00
Thibaud Fabre
9ea7629a6a Merge pull request #1937 from alchemy-fr/revert-1936-fix/non-unique-validation-tokens 
Revert "Fix non unique validation tokens"
 2016-09-21 15:15:45 +02:00
Thibaud Fabre
b255f32e34 Revert "Fix non unique validation tokens" 2016-09-21 15:15:38 +02:00
Thibaud Fabre
7eda83d973 Merge pull request #1936 from alchemy-fr/fix/non-unique-validation-tokens 
Fix non unique validation tokens
 2016-09-21 15:14:10 +02:00
Jean-Yves Gaulier
e10971a88f PHRAS-1216_story-cover-changed-event 
#time 1h
 2016-09-21 15:13:12 +02:00
Thibaud Fabre
e2f0285356 Remove limit clause and use maxResults query method 2016-09-21 15:03:00 +02:00
Thibaud Fabre
46283817aa Fix login issues when multiple validation tokens exist 2016-09-21 14:46:14 +02:00
Thibaud Fabre
8ff6f3484e Merge pull request #1935 from moctardiouf/patch-2 
fix syntax error text_mail_receiver
 2016-09-19 15:15:31 +02:00
moctardiouf
4ff084ffe5 fix syntax error text_mail_receiver 2016-09-16 19:21:27 +02:00
Thibaud Fabre
7041c960c7 Fix filename 2016-08-02 15:25:53 +02:00
Thibaud Fabre
d6a68b9257 Merge pull request #1931 from aztech-dev/4.0 
Remove autosubmit from order manager list
 2016-07-29 15:06:26 +02:00
Thibaud Fabre
884d59462c Remove autosubmit from order manager list 2016-07-29 15:05:39 +02:00
Thibaud Fabre
144ebfb02a Merge pull request #1930 from aztech-dev/4.0 
Allow removing order masters without adding a new one
 2016-07-29 15:03:34 +02:00
Thibaud Fabre
303a39e359 Allow removing order masters without adding a new one 2016-07-29 14:46:18 +02:00
jygaulier
98dbb863fe Merge pull request #1927 from jygaulier/PHRAS-1190_prod-search-thesaurus 
PHRAS-1190_prod-search-thesaurus
 2016-07-19 15:36:55 +02:00
Jean-Yves Gaulier
19342cf45c PHRAS-1190_prod-search-thesaurus 
- removed comment
- test is ok (no more timeout) but without changes from first commit (???)
 2016-07-19 13:46:27 +02:00
Jean-Yves Gaulier
0dac4a4573 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 12:00:47 +02:00
Jean-Yves Gaulier
5ae1b8355d PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 11:37:46 +02:00
Jean-Yves Gaulier
69914dee31 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-18 16:42:52 +02:00
Jean-Yves Gaulier
1abe2463e8 PHRAS-1190_prod-search-thesaurus 
- fix : prod / thesaurus search is ok (language doesn't care)
#time 2h
 2016-07-18 15:32:27 +02:00
jygaulier
d558192a74 Merge pull request #1910 from jygaulier/PHRAS-1168_Backport-PHRAS-1094-to-4.0 
PHRAS-1168_Backport-PHRAS-1094-to-4.0
 2016-07-18 13:32:27 +02:00
Thibaud Fabre
afd413021d Merge pull request #1923 from lostdalek/feature/videoEditing 
Feature video editing
 2016-07-12 15:11:40 +02:00
Thibaud Fabre
9dc6509911 Merge pull request #1925 from aztech-dev/feature/cors-configuration 
PHRAS-1180 Add configuration entry to enable CORS on custom paths
 2016-07-12 15:11:32 +02:00
Thibaud Fabre
9ca8dee44f PHRAS-1180 Add configuration entry to enable CORS on custom paths 2016-07-12 14:22:12 +02:00
Florian BLOUET
4ad4c0a75e Bump Phraseanet Production Client 
update video tools features
- change active range with up/down hotkeys
 2016-07-08 17:03:13 +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
e84d5a8e72 Bump Phraseanet Production Client 
update video tools features
- fix scroll
- add range duration in control bar
- fix range list display in fullscreen mode
 2016-07-07 17:37:45 +02:00
Florian BLOUET
3543db9eb8 Bump Phraseanet Production Client 
update video tools features
- fix css resizing issues
 2016-07-07 15:56:44 +02:00
Florian BLOUET
3a55f3d03a Bump Phraseanet Production Client and Embed Bundle npm dependencies 
update video tools features
- fix VTT content import/export
 2016-07-07 12:28:31 +02:00
Florian BLOUET
66147a5165 Bump Phraseanet Production Client 
update video tools features
- import /export VTT content
 2016-07-06 18:13:48 +02:00
Florian BLOUET
b167766525 Bump Phraseanet Production Client 
update video tools features
- add configurable vtt field name
- fix range reordering
- fix keyboard shortcuts
- add keyboard shortcut (add new range)
 2016-07-06 16:46:04 +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
bb2d2084a9 Bump Phraseanet Production Client 
update video tools features
- add start range snapshot
 2016-07-04 11:41:12 +02:00
Thibaud Fabre
3072125658 Fix include resolution for search type 2 2016-07-02 15:40:32 +02:00
Thibaud Fabre
36751d1afb Merge pull request #1919 from aztech-dev/improvement/story-search-type 
Fix incorrect include resolution for search type 2
 2016-07-02 15:38:00 +02:00
Thibaud Fabre
8c888b99f5 Fix incorrect include resolution for search type 2 2016-07-02 15:35:45 +02:00