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
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

1499 Commits

Author SHA1 Message Date
Benoît Burnichon
d8a49c336e minor EOL change 2015-04-03 12:11:05 +02:00
Olivier Mayer
db621bb5cc Thesaurus white 2015-03-30 19:29:50 +09:00
Olivier Mayer
30d9bccbf2 Issues Monday + more 2015-03-30 19:28:33 +09:00
Jean-Yves Gaulier
38ac6655cb wip : facettes ui 
- expanders (triangles) on right side
- closed facets when filter is applied
- fix : removing a concept after node expansion
- elements moved to css as :before/content

todo:
- shorten long texts with '...'
- css for white layout...
 2015-03-26 20:28:03 +01:00
Jean-Yves Gaulier
01bbd3a4da wip : facettes ui 2015-03-26 16:43:06 +01:00
Olivier Mayer
32243449de CSS white 2015-03-26 16:07:46 +09:00
Olivier Mayer
f5a84eeb73 update 2015-03-26 01:30:13 +09:00
Benoît Burnichon
86b3a2aa70 Merge pull request #1319 from kwemi/design-update-v2 
update pagination
 2015-03-25 11:24:35 +01:00
Olivier Mayer
0b17f8d5ce update pagination 
fix #33
 2015-03-25 17:56:29 +09:00
Benoît Burnichon
75c62cc4c8 Merge pull request #1316 from kwemi/design-update-v2 
Design update v2
 2015-03-24 13:23:17 +01:00
Olivier Mayer
f9170989e7 fix #36 2015-03-24 20:38:38 +09:00
Olivier Mayer
78cf0eb999 fix #34 2015-03-24 20:25:59 +09:00
Olivier Mayer
6c28e11dbc fix #37, fix #23 2015-03-24 20:14:23 +09:00
Nicolas Le Goff
ddfe5a2523 Add possibility to set empty query as default query in user setting 2015-03-21 12:06:11 +01:00
Olivier Mayer
7f0e160ad5 Sidebar min width 2015-03-20 21:06:23 +09:00
Olivier Mayer
2469e9ca68 action button 2015-03-20 21:01:29 +09:00
Olivier Mayer
aa2c0f9bcf Picto info 2015-03-20 20:27:12 +09:00
Olivier Mayer
5eec2eba1a Document type picto rollback 2015-03-20 20:08:48 +09:00
Olivier Mayer
23aa4d410b Deleted next button 2015-03-20 20:08:15 +09:00
Olivier Mayer
795e137011 Sidebar fix 
fix #26, fix #21
 2015-03-20 19:23:08 +09:00
Olivier Mayer
da10fe75d2 Basket icons 
fix #13
 2015-03-20 17:35:07 +09:00
Olivier Mayer
605145c6ba Test behaviour #18 
fix #18
 2015-03-20 16:53:22 +09:00
Olivier Mayer
2a32b1d03a Tabs order + icons change 
fix #25
 2015-03-20 16:23:52 +09:00
Olivier Mayer
bc42c2adef Admin icons fix 
fix #27
 2015-03-20 16:20:14 +09:00
Olivier Mayer
41e17b17da Grid margin 
fix #28
 2015-03-20 16:15:41 +09:00
Olivier Mayer
d8692f4afc Icon update, pagination. settings options 
fix #10, fix #9, fix #4
 2015-03-20 00:15:34 +09:00
Mathieu Darse
c82f9ddaf3 Fix query debug JS 2015-03-17 19:45:24 +01:00
Mathieu Darse
299e97351c Back button to cancel facet selection 2015-03-17 19:45:24 +01:00
Mathieu Darse
4419b1b3a7 Refactor facets handling 2015-03-17 19:45:14 +01:00
Nicolas Le Goff
a08c2e390f Fix display aggragations 2015-03-12 22:32:19 +01:00
Benoît Burnichon
54a476a75c Change encoding of file from ISO to UTF8 2015-03-12 15:08:26 +01:00
Jean-Yves Gaulier
3c9c705fdf fix config and latest strings 2015-03-11 18:25:20 +01:00
Mathieu Darse
63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer 
Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js
 2015-03-10 15:25:20 +01:00
Nicolas Le Goff
ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer 
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
 2015-03-10 14:36:31 +01:00
Nicolas Le Goff
5ee0d46cfb Merge pull request #1278 from kwemi/design-update-v1 
Design update v1
 2015-03-10 11:56:01 +01:00
Olivier Mayer
19da79baf6 Thesaurus tab fix 2015-03-10 19:53:24 +09:00
Olivier Mayer
4b523ac8df Push picto update 2015-03-10 19:32:54 +09:00
Olivier Mayer
2df0a404ea Menu trigger icon 2015-03-10 19:19:10 +09:00
Nicolas Le Goff
4999173467 Merge pull request #1273 from nlegoff/remove-ws 
[3.9] Remove Websockets dependencies
 2015-03-10 11:05:47 +01:00
Olivier Mayer
496b8b8424 Merge remote-tracking branch 'origin/design-update-v1' into design-update-v1 
Conflicts:
	www/skins/prod/000000/prodcolor.css
 2015-03-10 17:56:06 +09:00
Nicolas Le Goff
bd4836aaa7 Remove Websockets dependencies 2015-03-10 09:55:43 +01:00
Olivier Mayer
5117c1710f Sidebar menu order + picto update 2015-03-10 17:55:07 +09:00
Olivier Mayer
d38cc9f6ae Paginate (partial) 2015-03-10 17:55:07 +09:00
Olivier Mayer
9aa5c3861f Sidebar menu order + picto update 2015-03-10 17:51:54 +09:00
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