mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-25 18:41:05 +00:00
Code Issues Projects Releases Wiki Activity
9177 commits 12 branches 100 tags 170 MiB
Commit graph

257 commits

Author SHA1 Message Date
Kevin Decherf
f1f1efb5de material: wrap card actions, remove class hiding of creation date 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-03-03 19:22:32 +01:00
Kevin Decherf
05232afe32 material: fix left padding of content on medium screens 
Fixes #3877

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-03-02 23:46:00 +01:00
Kevin Decherf
fb7dedf36c material: move a media query from cards to dedicated scss file 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-03-02 22:48:43 +01:00
Jeremy Benoist
a6b242a1fd
Enable OTP 2FA 
- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa
 2019-01-23 13:28:02 +01:00
Jeremy Benoist
50f35f0db2
Move icon into the top menu bar 
Change the way to select a random entry:
- select all ids from the given user (with filters)
- choose randomly one in php
- find that entry
 2019-01-19 22:24:10 +01:00
Jeremy Benoist
5419a8368e
Merge remote-tracking branch 'origin/master' into 2.4 2019-01-15 09:41:18 +01:00
Kevin Decherf
20898d5ef4
Merge pull request #3783 from wallabag/issue-3780 
material: decrease size of tags on list view
 2018-11-26 18:45:38 +01:00
Kevin Decherf
13d94929ec material: decrease size of tags on list view 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-11-25 15:38:17 +01:00
Kevin Decherf
e5de9917fd material: fix missing thumbnail on list view 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-11-25 15:00:08 +01:00
Jeremy Benoist
b878be4cc9
Merge remote-tracking branch 'origin/master' into 2.4 
# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js
 2018-11-25 09:58:18 +01:00
Simounet
2daae77094 Card no preview replaced by wallabag logo 2018-11-21 18:51:44 +01:00
Matt Burke
cefbe6a87f Add placeholder image to card-based gallery entries page for #3651 
I referenced https://css-tricks.com/using-svg/ for using the SVG icon.
The icon has a black foreground and white background, which doesn't
look very good as a placeholder. So, using the background-image style
to show the svg and the inversion filter to make it white on gray.

With the image always present, there isn't much difference between
the with and without image preview templates, so I merged them.

Tested on Chrome, Firefox, and Safari on OSX.
 2018-10-15 23:59:39 -04:00
Stéphane HULARD
32968bd30e
Add specific styles for the card tag form element. 
Also add a `.hidden` class in the baggy theme to have consistency with material.
 2018-09-25 10:18:35 +02:00
Stéphane HULARD
9b0aef9171
Update tag list template to allow renaming. 
* Add a form on each tag to handle rename action.
* Add JavaScript to handle action on the corresponding page inside the global index.js file.
* Add support for the 2 active themes : material / baggy

The form solution is cleaner than an Ajax one because it let the browser validate input data and make the POST easier without the need to handle JSON response.
 2018-09-25 10:18:08 +02:00
Simounet
e93f37206a wallabag logo (side-nav) replaced by an SVG one 2018-07-11 21:57:53 +02:00
Simounet
4c78612eb4 wallabag logo with typo replaced by an SVG one 2018-07-11 21:51:52 +02:00
Simounet
2fdd512488 Fake wallabag logo data image replaced by real SVG 2018-07-11 21:25:46 +02:00
Simounet
6cf7f21dcb Fix mobile viewport on big iframe and video elements 2018-06-28 15:22:51 +02:00
Jérémy Benoist
36054f5dd4
Merge pull request #3636 from flozz/syntax-highlight 
Highlight code in articles using highlight.js
 2018-06-07 06:22:14 +00:00
Simounet
f136d288d6 Fix Firefox mobile unneeded resize 
Before that, on Firefox Mobile, when you were moving to the top or to
the bottom of the page, you were stopped before to go to the opposite
side.
 2018-05-24 09:04:02 +02:00
Simounet
a6e5637507 Fix overflow wrap issue 2018-05-21 19:47:28 +02:00
Fabien LOISON
b2e7b8b600
Highlight code in articles using highlight.js 2018-04-23 19:11:24 +02:00
Simounet
91f5992423 Close add entry and search nav JS action improved 2018-01-12 10:07:46 +01:00
Simounet
2831e77cce Nav close button alignment and nav boxes improved 2018-01-12 10:07:46 +01:00
Simounet
63771b9ae3 Fix nav new entry and search form alignment 2018-01-12 10:07:46 +01:00
Simounet
f86c2b5fa6 Label replaced by a button on the nav search form 2018-01-12 10:07:46 +01:00
Simounet
e9e3f93805 Label replaced by a button on the nav new entry form 2018-01-12 10:07:46 +01:00
Simounet
49fb9e7cab Card tags template shared 2017-12-26 09:02:00 +01:00
Simounet
a8541089be Useless span removed from the card's title 2017-12-26 09:00:33 +01:00
Simounet
f072829ce3 More space for navbar actions on mobile 2017-12-08 21:10:36 +01:00
Simounet
da2a5fe222 Toggle menu anchor replaced by a button 2017-12-08 21:01:44 +01:00
Simounet
93e3329c58 Fix nav title nowrap on mobile 2017-12-07 23:46:29 +01:00
Simounet
7475924eac Border radius on every corner of tag's list 2017-12-08 10:20:58 +01:00
Simounet
c235cb75cd Fix duplicated code removed 2017-12-08 10:18:49 +01:00
Simounet
3e7d86b2c5 Tags list view improved 
No text ellipsis so we can see the whole tag, better responsiveness, bigger
touch height on links.
 2017-12-08 10:18:49 +01:00
Simounet
a6beec1bd2 Footer's stats displayed on mobile 2017-12-06 22:46:24 +01:00
Simounet
39217f3108 Fix line-height issue on the footer 2017-12-06 22:21:19 +01:00
Simounet
1f84aa903d Fix wrong selected page number alignment on pagination 2017-12-04 22:46:35 +01:00
Simounet
f836b98fa6 Fix pagination on list mode 2017-12-04 22:31:30 +01:00
Simounet
2784f674ea Figure image and figcaption centered on share page 2017-12-03 14:41:15 +01:00
Simounet
970e107524 Share page improved (mobile + header's padding) 2017-12-03 14:38:46 +01:00
Kevin Decherf
2f510787e7 material: replace card activator with article link on card preview 
Fixes #2424

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-06 20:49:41 +01:00
Kevin Decherf
3d46eeeb33 material: disable editing of entry url input when submitting new url 
Fixes #1871

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-05 13:14:47 +01:00
Kevin Decherf
7a1e1247cb webpack: handle _global img folder 
Fixes missing image files after composer cleaning assets

Source of requireAll(): https://stackoverflow.com/a/30652110

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-10-16 00:01:52 +02:00
Kevin Decherf
ef7f187fa8 Fix non-centered login form 
Fixes #3343

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-10-16 00:01:52 +02:00
Nicolas Lœuillet
ed5e175c20 Merge pull request #3347 from Kdecherf/entry-stats 
Entry view: update .stats margins and color
 2017-09-16 13:01:33 +02:00
Kevin Decherf
79ea33c9d3 Entry view: update .stats margins and color 
Decreasing margin of .stats, increasing vertical margin of .stats li,
increasing right margin of material icons and reducing contrast of
material icons.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-09-09 21:35:19 +02:00
Kevin Decherf
e317a5ab60 Fix webpack error on comments 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-09-06 22:42:23 +02:00
Thomas Citharel
77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
Jeremy Benoist
6b1b148d65 Add share.scss file 
Still needs to include it in the twig template
 2017-06-22 12:13:22 +02:00
Thomas Citharel
f99ebec0f2 Fix mobile view and update asset deps 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-15 07:58:12 +02:00
Nicolas Lœuillet
dfd821dcfb
Removed padding on entry view 2017-06-13 16:52:14 +02:00
adev
2c3e148b00 Displays an error with an annotation with a too long quote 
Fix #2762
 2017-06-04 11:38:29 +02:00
Nicolas Lœuillet
84b041e87f
Reduced border-radius for tags 2017-05-31 20:31:35 +02:00
Thomas Citharel
91775f36fe Add some flex magic 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-31 14:34:46 +02:00
Nicolas Lœuillet
812c980fa5 Fixed tags display on grid view 2017-05-31 13:26:29 +02:00
adev
60c522899b Fix delete annotation when username is defined 
When an user set his name in "Config" > "User Information", he
can't delete or update an annotation

Fix #2382
 2017-05-14 11:38:02 +02:00
Thomas Citharel
efac66cb56 icon mail a bit better 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-09 11:04:02 +02:00
Thomas Citharel
ff5cdbdc95 fix 3-dots menu position 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-08 12:32:20 +02:00
Thomas Citharel
4c6ee89c9c Fix review again 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-07 17:13:08 +02:00
Aline
34806fab1b Fix reviews 
Signed-off-by: Aline <chetta.aline@gmail.com>
 2017-05-07 15:07:50 +02:00
Thomas Citharel
14f58edd80 fixed margin on sidebar menu 2017-05-05 09:19:56 +02:00
Thomas Citharel
2003ffa97e Fix according to review 2017-05-04 17:44:42 +02:00
Thomas Citharel
18e1da6277 rebase 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-04 14:56:52 +02:00
Thomas Citharel
64f81bc316 Adds Webpack support and removes the use for Grunt 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use scss

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix build, add babel, fix annotations

fixes (and improvements !) for baggy

add live reload & environments & eslint & theme fixes
 2017-05-04 14:49:44 +02:00
Nicolas Lœuillet
a40029f9d6
Disabled shortcuts on login/register page 2017-05-02 16:21:06 +02:00
Nicolas Lœuillet
7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00
Nicolas Lœuillet
5e9009ce86 Added publication date 2017-04-05 22:22:52 +02:00
Nicolas Lœuillet
b5a5377af1
Added migration for Scuttle sharing 2017-03-28 14:20:14 +02:00
FrenchHope
fb9f100e8f
Scuttle sharing 2017-03-28 14:20:14 +02:00
Kevin Decherf
3cc0cc0ae7 Fix nav-panel-search height 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-02-02 21:48:59 +01:00
Nicolas Lœuillet
144f2039e4 Merge pull request #2729 from Simounet/fix/double-overlay-right-sidenav 
Fix double overlay on expanded right sidenav
 2016-12-30 15:01:39 +01:00
Simounet
ccb9e79a35 Fix double overlay on expanded right sidenav 2016-12-30 14:00:19 +01:00
Simounet
bb2934d476 Fix action's icons position 2016-12-30 13:54:13 +01:00
Simounet
8e2419a5cf Fix right side-nav scrolling on low height window 2016-12-30 13:50:59 +01:00
Simounet
22d0c929e3 Access to search, filters, export on mobile 2016-12-29 19:19:51 +01:00
Simounet
78d6c3090a Fix the box shadow on the card entry 2016-12-20 13:04:51 +01:00
Nicolas Lœuillet
9aa991281d
Renamed view_mode by list_mode and hide excerpt 2016-11-28 16:10:21 +01:00
Nicolas Lœuillet
56a7ce17f3 Hide article text on mobile with list mode 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet
9f01d0fde0 Added list view 2016-11-28 14:27:58 +01:00
Kevin Decherf
56026217c5 Material: update size of text in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:49:45 +01:00
Kevin Decherf
819c8f5bd4 Material: render blockquote in italic and strong in bold in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
fdaa044314 Material: update style of pre in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
59cfd63c23 Material: update style of ul in article 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
858430c0d0 Material: update style of article links 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:53 +01:00
Kevin Decherf
5ea90fa8b9 Material: increase max width of article on large screens 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:39:49 +01:00
Kevin Decherf
7470a2f36a Material: prevent bold in title, update title font size 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:37:42 +01:00
Kevin Decherf
5b69e03eb4 Material: change color of background, article content and titles 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-25 13:37:42 +01:00
Nicolas Lœuillet
66e9dde0dc
Fixed logout shortcut 2016-11-23 14:40:00 +01:00
Nicolas Lœuillet
0df2a4b021
Fixed entry shortcuts available in list view 2016-11-22 21:31:21 +01:00
Nicolas Lœuillet
c526f9e474 Added help about shortcuts 2016-11-22 13:07:42 +01:00
Jeremy Benoist
77e2898ad4
Fix card action overlap 
On smaller resolution
 2016-11-20 10:14:19 +01:00
Nicolas Lœuillet
995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
32f455c131 Added tests 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
ee122a7528 Added a simple search engine 
Fix #18
 2016-11-19 19:17:30 +01:00
Jeremy Benoist
68003139e1
Merge remote-tracking branch 'origin/master' into 2.2 
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
 2016-11-19 15:30:49 +01:00
Nicolas Lœuillet
94f2057ffe
Added CSS class on links 2016-11-16 09:17:12 +01:00
Thomas Citharel
10a1ffae53
Fix keyboard navigation on quickstart view 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-15 22:23:50 +01:00
Thomas Citharel
c930992348 fix next/prev page 2016-11-15 21:55:16 +01:00
Thomas Citharel
5637a26e9a Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page ! 
Also better indentation for js files (changed editorconfig for them).

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-15 21:55:10 +01:00
Nicolas Lœuillet
16ef7607f4 Reorganized JS folders for shortcuts 2016-11-15 21:54:50 +01:00
Thomas Citharel
af61cb80eb es6 imports 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-15 21:54:41 +01:00
Nicolas Lœuillet
f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
Nicolas Lœuillet
3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet
80302e5aaa Changed display for material theme 2016-11-14 13:58:41 +01:00
Nicolas Lœuillet
1c282b1da0 Added creation date on entries view 2016-11-14 13:57:31 +01:00
Nicolas Lœuillet
8a9604aafe Added unmark.it sharing 
Fix #668
 2016-11-09 18:18:49 +01:00
Jeremy Benoist
8d7b4f0eff
Display a bigger image in case of image content 
If the content is only an image, we can display a bigger preview image because we won’t have text to display.

Also, split different card view to avoid too much complexity in the entries.html.twig
 2016-11-08 22:17:46 +01:00
Jeremy Benoist
7005b425e0
Remove the left margin of tag 
In the entries list, the first tag below the link isn’t stick to the left. Now it is.
 2016-11-08 22:15:37 +01:00
Thomas Citharel
32508ef07a
avoid eslint warning by disabling line 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-03 14:23:09 +01:00
Thomas Citharel
d56d416d9b
Deal with more resolution issues 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-03 12:49:57 +01:00
Thomas Citharel
3221b2e413
Fix resolution issues and 'title' issues 
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-11-03 11:28:40 +01:00
Nicolas Lœuillet
3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet
e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
Jeremy Benoist
817724a7b8
Re-add bottom pagination 
Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template
 2016-10-22 13:09:16 +02:00
Thomas Citharel
ab61dbc073
remove padding on small widths 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-22 13:08:12 +02:00
Thomas Citharel
34aa06a9b9
WIP 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2016-10-22 13:08:04 +02:00
Thomas Citharel
d32e1c424a Fix baggy on small screens 2016-10-15 19:04:53 +02:00
Thomas Citharel
08f5a5b6bd fix stylelint 2016-10-15 15:25:46 +02:00
Alexandr Danilov
38dc91be8e Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens 2016-10-15 14:49:07 +02:00
Jeremy Benoist
e084778030
CS 2016-10-09 19:35:27 +02:00
Jeremy Benoist
28bb48905a
Optimize the way tag list is rendered 
Instead of retrieve all informations about entries of a tag to just count them, we’ll count them before with a fastest query.

Also change the layout of the tag list in material design
 2016-10-09 18:55:22 +02:00
Thomas Citharel
15f1352ef8
better tags on material 2016-10-05 14:06:55 +02:00
Thomas Citharel
645c0d5bce
better tags on baggy 2016-10-04 20:11:10 +02:00
Thomas Citharel
c10adc1f76
typo and build on test 2016-10-04 15:59:56 +02:00
Thomas Citharel
6cb364a2c1
use airbnb base rules and update eslint 2016-10-04 15:30:05 +02:00
Nicolas Lœuillet
0c7f1ba796
Fixed icon position in share menu 2016-10-04 14:58:06 +02:00
Thomas Citharel
46d78f87d9
fix icons 2016-10-04 14:48:22 +02:00
Thomas Citharel
9f7d154e34
Add eslint & stylelint tests (fix a few things) and move dependencies to dev 2016-10-04 12:14:28 +02:00
Jeremy Benoist
9f3a1cd20c shaarli instead of Diaspora 2016-10-04 07:26:18 +02:00
Thomas Citharel
a494c33ef7
Basically, fix everything 
* Remove install.sh
* Assets are now provided
* Icons font issues are fixed
 2016-10-03 23:08:26 +02:00
Nicolas Lœuillet
0f70abd695
Fixed CSS for quickstart links 2016-10-03 10:27:01 +02:00
Nicolas Lœuillet
ab809de184 Merge pull request #2314 from wallabag/assets 
Assets work
 2016-10-03 09:09:45 +02:00
Nicolas Lœuillet
a44d2613c7 Changed quickstart layout 2016-10-01 17:13:53 +02:00
Thomas Citharel
0471e905b8
fonts & ligatures 2016-09-29 09:18:46 +02:00
Thomas Citharel
8f234d0156
remove autocomplete and bring fonts through npm 2016-09-28 18:59:15 +02:00
Thomas Citharel
c146f6940a
Assets work 
* ES6 all the things !

* ESLint checks everything

* CSS fixes (use stylelint)

* Fix #2231
 2016-09-28 10:30:18 +02:00
Nicolas Lœuillet
1ed965beb9
Remove CSS class who caused long loading on Firefox 
Fix #2302 #2281
 2016-09-27 20:52:30 +02:00
Nicolas Lœuillet
d49c88f15a Remove footer part 2016-09-13 20:31:06 +02:00
Jeremy Benoist
8f8654913c Merge pull request #2002 from wallabag/feature-display-itemsNumber 
Feature display items number
 2016-09-03 16:13:08 +02:00
Nicolas Lœuillet
b1e0a586e8
Fixed different font-size for labels in config screen 
Fix #1788
 2016-09-02 10:53:22 +02:00
Nicolas Lœuillet
336262e6ee Merge pull request #2252 from wallabag/fix-last-merge 
Fixed last merge who caused CSS/JS bugs
 2016-09-02 10:27:41 +02:00
Jeremy Benoist
33adf8dc91 Merge pull request #2242 from wallabag/fix-minor-css 
Fix print / article views
 2016-09-01 22:23:45 +02:00
Nicolas Lœuillet
be20e6f009
CSS indentation 2016-09-01 19:18:39 +02:00
Nicolas Lœuillet
a374ac0fd3
Fixed last merge who caused CSS/JS bugs 2016-08-30 13:52:28 +02:00
Jeremy Benoist
cdd3010b47
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-28 16:15:27 +02:00
Nicolas Lœuillet
add0e14cff
Fixed print view for baggy theme 2016-08-26 21:20:02 +02:00
Nicolas Lœuillet
52ef497099 Fix print / article views 2016-08-26 14:35:43 +02:00
Nicolas Lœuillet
8e06720ff3
Add icon for public share link 2016-08-25 16:19:21 +02:00
Nicolas Lœuillet
8315130a75
Display entries number for each category 2016-08-23 07:47:55 +02:00