Olivier Mayer
|
431028f56b
|
Paginate (partial)
|
2015-03-10 16:34:21 +09:00 |
|
Nicolas Le Goff
|
6b89c123e3
|
Merge pull request #1266 from kwemi/design-update-v1
fix #7, fix #11, fix #12
|
2015-03-06 11:44:38 +01:00 |
|
Olivier Mayer
|
67873d6645
|
fix #7, fix #11, fix #12
|
2015-03-06 18:55:03 +09:00 |
|
Nicolas Le Goff
|
4f66588600
|
Add dynamic facets query
|
2015-02-26 12:28:22 +01:00 |
|
Mathieu Darse
|
a84602f896
|
Move concept injection into query parser
|
2015-02-25 16:12:58 +01:00 |
|
Nicolas Le Goff
|
aac3c5de5c
|
Merge pull request #1258 from kwemi/design-update-v1
980px layout
|
2015-02-24 11:53:42 +01:00 |
|
Olivier Mayer
|
e028b4c7d5
|
980px layout
|
2015-02-24 18:18:31 +09:00 |
|
Nicolas Le Goff
|
5b3e699599
|
Merge remote-tracking branch 'upstream/3.8'
Conflicts:
bower.json
composer.lock
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/User/Query.php
lib/classes/patch/320alpha4b.php
templates/web/admin/statusbit.html.twig
templates/web/prod/actions/Tools/index.html.twig
templates/web/prod/index.html.twig
templates/web/prod/upload/lazaret.html.twig
templates/web/prod/upload/upload-flash.html.twig
www/scripts/apps/login/home/config.js
www/skins/prod/000000/prodcolor.css
www/skins/prod/959595/prodcolor.css
|
2015-02-23 19:16:56 +01:00 |
|
Nicolas Le Goff
|
f06cb7eaec
|
Merge pull request #1253 from kwemi/design-update-v1
Design update
|
2015-02-23 11:42:27 +01:00 |
|
Olivier Mayer
|
a49acb03e4
|
Design update
|
2015-02-23 15:15:55 +09:00 |
|
Nicolas Le Goff
|
111755fa9b
|
Refactor status display
|
2015-02-19 15:14:23 +01:00 |
|
Nicolas Le Goff
|
c6bab1182d
|
Merge pull request #1250 from kwemi/design-update-v1
Design update v1
|
2015-02-19 10:54:18 +01:00 |
|
Olivier Mayer
|
50352c0e90
|
header size
fix #5
|
2015-02-19 18:35:18 +09:00 |
|
Olivier Mayer
|
1f2d79355f
|
Result number
fix #4
|
2015-02-19 18:29:45 +09:00 |
|
Olivier Mayer
|
bd4bb78b59
|
Double arrow
fix #3
|
2015-02-19 17:39:36 +09:00 |
|
Olivier Mayer
|
7e26d48daf
|
Fix result padding
fix #2
|
2015-02-19 11:05:55 +09:00 |
|
Olivier Mayer
|
50ed2262ed
|
Fix broken layout
fix #1
|
2015-02-19 11:04:43 +09:00 |
|
Nicolas Le Goff
|
23f4761aa6
|
Merge pull request #1197 from nlegoff/improve-symlinks
[3.9] Simpler thumbnails display
|
2015-02-16 19:17:38 +01:00 |
|
Olivier Mayer
|
13a87a6181
|
Modification general layout
Change items size, color etc
|
2015-02-17 00:57:45 +09:00 |
|
Nicolas Le Goff
|
a3ef1b606c
|
Makes static thumbnails delivery as default delivery && set symlink dir in www directory
|
2015-02-16 15:01:44 +01:00 |
|
Nicolas Le Goff
|
4cd2ef9a6d
|
Merge pull request #1235 from nlegoff/sprint387
[3.8] some fixes
|
2015-02-11 19:49:03 +01:00 |
|
Nicolas Le Goff
|
948971eba4
|
PHRAS-408 #fix
|
2015-02-11 19:47:48 +01:00 |
|
Jean-Yves Gaulier
|
d02d09e893
|
fix #PHRAS-343 #time 30m
select is reset
|
2015-02-11 18:51:39 +01:00 |
|
Nicolas Le Goff
|
d25ce23f46
|
PHRAS-394 #fix
|
2015-02-11 17:01:33 +01:00 |
|
Nicolas Le Goff
|
4e5dca3720
|
Fix javascript issues
|
2015-02-06 19:14:21 +01:00 |
|
Nicolas Le Goff
|
e23c35616c
|
Fix check path
|
2015-02-06 16:39:27 +01:00 |
|
Nicolas Le Goff
|
cec55560a5
|
Fix status img size
|
2015-02-06 16:14:41 +01:00 |
|
Nicolas Le Goff
|
57e2f0411f
|
Fix installation
|
2015-02-06 13:26:49 +01:00 |
|
Nicolas Le Goff
|
949bf06cac
|
Merge branch '3.8'
Conflicts:
CHANGELOG.md
bin/console
bin/developer
bin/setup
bower.json
composer.json
composer.lock
features/bootstrap/FeatureContext.php
features/bootstrap/GuiContext.php
lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php
lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
lib/Alchemy/Phrasea/Command/CreateCollection.php
lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Client/Baskets.php
lib/Alchemy/Phrasea/Controller/Client/Root.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Prod/Property.php
lib/Alchemy/Phrasea/Controller/Prod/Records.php
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php
lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php
lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
lib/Alchemy/Phrasea/Helper/User/Edit.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
lib/Doctrine/Entities/AuthFailure.php
lib/Doctrine/Entities/Basket.php
lib/Doctrine/Entities/BasketElement.php
lib/Doctrine/Entities/LazaretAttribute.php
lib/Doctrine/Entities/LazaretCheck.php
lib/Doctrine/Entities/LazaretFile.php
lib/Doctrine/Entities/LazaretSession.php
lib/Doctrine/Entities/Session.php
lib/Doctrine/Entities/SessionModule.php
lib/Doctrine/Entities/StoryWZ.php
lib/Doctrine/Entities/UsrList.php
lib/Doctrine/Entities/UsrListEntry.php
lib/Doctrine/Entities/UsrListOwner.php
lib/Doctrine/Entities/ValidationData.php
lib/Doctrine/Entities/ValidationParticipant.php
lib/Doctrine/Entities/ValidationSession.php
lib/Doctrine/Logger/MonologSQLLogger.php
lib/Doctrine/Repositories/BasketRepository.php
lib/Doctrine/Repositories/ValidationParticipantRepository.php
lib/Doctrine/Types/Binary.php
lib/Doctrine/Types/Blob.php
lib/Doctrine/Types/Enum.php
lib/Doctrine/Types/LongBlob.php
lib/Doctrine/Types/VarBinary.php
lib/classes/API/OAuth2/Account.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/OAuth2/Application/OfficePlugin.php
lib/classes/API/OAuth2/AuthCode.php
lib/classes/API/OAuth2/RefreshToken.php
lib/classes/API/OAuth2/Token.php
lib/classes/API/V1/Abstract.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/API/V1/exception/abstract.php
lib/classes/API/V1/exception/badrequest.php
lib/classes/API/V1/exception/forbidden.php
lib/classes/API/V1/exception/internalservererror.php
lib/classes/API/V1/exception/maintenance.php
lib/classes/API/V1/exception/methodnotallowed.php
lib/classes/API/V1/exception/notfound.php
lib/classes/API/V1/exception/unauthorized.php
lib/classes/API/V1/result.php
lib/classes/Exception/Feed/EntryNotFound.php
lib/classes/Exception/Feed/ItemNotFound.php
lib/classes/Exception/Feed/PublisherNotFound.php
lib/classes/Feed/Abstract.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/CollectionInterface.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Collection.php
lib/classes/Feed/Entry/CollectionInterface.php
lib/classes/Feed/Entry/Interface.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Entry/ItemInterface.php
lib/classes/Feed/Interface.php
lib/classes/Feed/Link.php
lib/classes/Feed/LinkInterface.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/Feed/Publisher/Interface.php
lib/classes/Feed/Token.php
lib/classes/Feed/TokenAggregate.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Atom.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/Feed/XML/Interface.php
lib/classes/Feed/XML/RSS.php
lib/classes/Feed/XML/RSS/Image.php
lib/classes/Feed/XML/RSS/ImageInterface.php
lib/classes/User/Adapter.php
lib/classes/User/Interface.php
lib/classes/appbox/register.php
lib/classes/connection.php
lib/classes/connection/abstract.php
lib/classes/connection/interface.php
lib/classes/connection/pdo.php
lib/classes/connection/pdoStatementDebugger.php
lib/classes/deprecated/countries.php
lib/classes/deprecated/inscript.api.php
lib/classes/eventsmanager/event/test.php
lib/classes/ftpclient.php
lib/classes/http/request.php
lib/classes/media/subdef.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskState.php
lib/classes/module/console/tasklist.php
lib/classes/module/console/taskrun.php
lib/classes/patch/320alpha4b.php
lib/classes/patch/3715alpha1a.php
lib/classes/patch/379alpha1a.php
lib/classes/patch/380alpha10a.php
lib/classes/patch/380alpha11a.php
lib/classes/patch/380alpha13a.php
lib/classes/patch/380alpha14a.php
lib/classes/patch/380alpha15a.php
lib/classes/patch/380alpha16a.php
lib/classes/patch/380alpha17a.php
lib/classes/patch/380alpha18a.php
lib/classes/patch/380alpha3a.php
lib/classes/patch/380alpha4a.php
lib/classes/patch/380alpha6a.php
lib/classes/patch/380alpha8a.php
lib/classes/patch/380alpha9a.php
lib/classes/patch/381alpha1b.php
lib/classes/patch/381alpha2a.php
lib/classes/patch/381alpha3a.php
lib/classes/patch/381alpha4a.php
lib/classes/patch/383alpha1a.php
lib/classes/patch/383alpha2a.php
lib/classes/patch/383alpha3a.php
lib/classes/patch/383alpha4a.php
lib/classes/record/adapter.php
lib/classes/record/preview.php
lib/classes/recordutils.php
lib/classes/recordutils/audio.php
lib/classes/recordutils/document.php
lib/classes/recordutils/map.php
lib/classes/recordutils/video.php
lib/classes/registry.php
lib/classes/registryInterface.php
lib/classes/set/order.php
lib/classes/system/url.php
lib/classes/task/Scheduler.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/apiwebhooks.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/emptyColl.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/test.php
lib/classes/task/period/writemeta.php
lib/conf.d/PhraseaFixture/AbstractWZ.php
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
templates/web/admin/collection/collection.html.twig
templates/web/common/dialog_export.html.twig
templates/web/common/menubar.html.twig
templates/web/prod/actions/Tools/index.html.twig
templates/web/prod/index.html.twig
templates/web/prod/upload/upload-flash.html.twig
templates/web/prod/upload/upload.html.twig
templates/web/report/report_layout_child.html.twig
templates/web/setup/step2.html.twig
templates/web/thesaurus/new-synonym-dialog.html.twig
templates/web/thesaurus/properties.html.twig
templates/web/thesaurus/search.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
|
2015-02-05 18:38:49 +01:00 |
|
Jean-Yves Gaulier
|
7185b031fb
|
#PHRAS-382 #time 3h
|
2015-02-03 15:52:39 +01:00 |
|
Nicolas Le Goff
|
1ad8418476
|
Merge pull request #1219 from jygaulier/PHRAS-271
fix #PHRAS-343
|
2015-01-28 14:56:42 +01:00 |
|
Jean-Yves Gaulier
|
2cf1a45a5b
|
fix #PHRAS-343 #time 20m
|
2015-01-28 12:12:33 +01:00 |
|
Jean-Yves Gaulier
|
36e6806362
|
#PHRAS-359 #time 5m
wide is better
|
2015-01-28 10:41:46 +01:00 |
|
Jean-Yves Gaulier
|
d2063cc195
|
fix #PHRAS-359 #time 30m
|
2015-01-27 19:25:12 +01:00 |
|
Nicolas Le Goff
|
5fe09febb7
|
Merge pull request #1209 from nlegoff/patch-387
[3.8.7] Fix some easy pick
|
2015-01-21 17:19:02 +01:00 |
|
Nicolas Le Goff
|
058fcfce06
|
PHRAS-284 Fix javascript issue
|
2015-01-21 16:14:44 +01:00 |
|
Nicolas Le Goff
|
a609685417
|
PHRAS-343 Disabled record type when choosing story search mode
|
2015-01-21 16:14:43 +01:00 |
|
Nicolas Le Goff
|
b3d50619c5
|
PHRAS-350 Deprecate client
|
2015-01-21 15:37:49 +01:00 |
|
Nicolas Le Goff
|
ea4a567b67
|
Bump year to 2015
|
2015-01-20 14:18:45 +01:00 |
|
Nicolas Le Goff
|
24410849a5
|
Add base ui for facets
|
2015-01-05 16:08:46 +01:00 |
|
Nicolas Le Goff
|
9f38823f27
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Prod/Story.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/User/Adapter.php
lib/classes/databox.php
lib/classes/media/subdef.php
lib/classes/module/report.php
lib/classes/module/report/activity.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/module/report/nav.php
lib/classes/module/report/question.php
lib/classes/module/report/sqlaction.php
lib/classes/module/report/sqlconnexion.php
lib/classes/module/report/sqldownload.php
lib/classes/module/report/sqlfilter.php
lib/classes/task/abstract.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/prod/index.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/report/activityTest.php
tests/classes/report/editTest.php
|
2014-12-09 13:59:29 +01:00 |
|
Nicolas Le Goff
|
e694677efd
|
CSS tweak for my eyes
|
2014-12-04 11:48:08 +01:00 |
|
Nicolas Le Goff
|
ec64d41ebb
|
Reduce advanced search window size
|
2014-11-24 16:42:55 +01:00 |
|
Nicolas Le Goff
|
4b8ab74f7b
|
#fix missing image
|
2014-11-12 20:35:08 +01:00 |
|
Nicolas Le Goff
|
2f261c64b2
|
PHRAS-322 #fix missing image
|
2014-11-12 19:43:19 +01:00 |
|
Jean-Yves Gaulier
|
6a1e161701
|
Report-VU : fix collection selection, date selectors, csv, ...
disabled log
|
2014-10-30 18:54:06 +01:00 |
|
Mathieu Darse
|
5b24664001
|
Merge branch 'master' into elastic-indexer
Conflicts:
bin/console
|
2014-10-15 12:18:44 +02:00 |
|
Mathieu Darse
|
85102bfce7
|
Merge remote-tracking branch 'upstream/master'
|
2014-10-15 12:14:08 +02:00 |
|
Damien Alexandre
|
f196155049
|
Fix PHRAS-322, add result debug informations (aggregations)
|
2014-10-14 18:51:02 +02:00 |
|
Nicolas Le Goff
|
28eecf6a09
|
Merge branch '3.8'
Conflicts:
.gitignore
bin/console
composer.json
composer.lock
hudson/fixtures.sql
lib/Alchemy/Phrasea/Command/Developer/IniReset.php
lib/Alchemy/Phrasea/Command/Setup/Install.php
lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
lib/Alchemy/Phrasea/Helper/Prod.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/Setup/Upgrade.php
lib/classes/media/subdef.php
lib/classes/task/period/RecordMover.php
templates/web/prod/index.html.twig
templates/web/setup/step2.html.twig
tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/db-ref.sqlite
vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
|
2014-10-09 19:40:33 +02:00 |
|