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
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
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
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
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
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
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
Benoît Burnichon
6cdc9d7a31
Remove some deprecated methods calls
2016-03-06 23:05:55 +01:00
Benoît Burnichon
614394edc7
Method renaming
2016-01-26 14:25:08 +01:00
Benoît Burnichon
51023c5533
bump copyright year
2016-01-05 13:38:14 +01:00
Benoît Burnichon
38ae7bc2ac
Rename get_number/set_number to getNumber/setNumber
2015-07-13 17:50:20 +02:00
Jean-Yves Gaulier
a958087398
PHRAS-556 #time 1m
...
CS
2015-07-02 11:19:46 +02:00
Jean-Yves Gaulier
22fb208667
PHRAS-556 #time 1h
...
CS
2015-06-30 18:13:42 +02:00
Jean-Yves Gaulier
04e6240414
PHRAS-556 #time 5h
...
- fix: creation of presets
- fix: usage of presets
- fix: deletion of presets
- new: routes for presets
2015-06-30 18:13:42 +02:00
Benoît Burnichon
6df9626fce
Use SubDefinitionSubstituerAware in some Controllers
2015-06-02 13:59:33 +02:00
Benoît Burnichon
469e2d0583
Add DataboxLoggerAware where needed
2015-05-14 23:43:00 +02:00
Benoît Burnichon
61206fd517
Replace calls to mediavorus to getMediaFromUri
2015-05-12 18:12:02 +02:00
Benoît Burnichon
81e8fcb606
Fixup CS and missing $this->app
2015-05-12 17:15:38 +02:00
Benoît Burnichon
634f5366ae
use DispatcherAware wherever possible
2015-05-12 17:15:11 +02:00
Benoît Burnichon
414111f7f2
Refactor EditController
2015-05-12 10:40:31 +02:00
Benoît Burnichon
fc03fa80be
Split EditController into Provider and Controller
2015-05-11 20:22:41 +02:00
