Commit graph

15 commits

Author SHA1 Message Date
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
Jeremy Benoist
79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Thomas Citharel
1d4d9aaf29
Bring tags on entries view to baggy
Also, a couple of UI improvement and CSS fixing
2016-07-01 13:59:30 +02:00
Thomas Citharel
eef833d644 uniformize tags on article view too 2016-06-24 12:07:45 +02:00
Thomas Citharel
a15022db96 minor ui fixes 2016-06-23 23:13:25 +02:00
Thomas Citharel
25dc07d3c9 Add tags on entries view
Should be tested on old browsers
2016-06-23 22:50:39 +02:00
Thomas Citharel
0743287f95 clean & lint stuff 2016-06-09 19:02:38 +02:00
Thomas Citharel
5ecdfcd041 manage assets through npm
first draft

remote assetic totally

work

nearly there

use at least nodejs > 0.12

use proper version of grunt

bump nodejs version for travis

update npm

workaround for materialize

install node 5.0

add grunt-cli

baggy theme & cache node modules

cache bower & npm

make travis build assets on php7 only

exclude installing node & npm if not needed & use bash

clean & try to make icomoon work on baggy

ready

config for travis

rebase

make travis work

more travis work

impove travis & update deps

add missing pixrem deps

add module through oddly lost

ui updates

install latest nodejs

add install_dev.sh, link local binaries for npm/bower/grunt

ui improvements (mostly baggy)

fix travis build

no need to install on travis

Add unread filter to entries pages

Add the ability to filter for unread pages in the filters menu.

Add unread filter test to EntryControllerTest

Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.

Improve English translation

Update FAQ

-Fix grammar
-Add notes about MTA, firewall, and SELinux

Update installation instructions

-Fix grammar
-Add SELinux section

add screenshots of android docu in English

Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121

Move fixtures to the right place

Display a message when saving an entry failed

When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.

Change ManyToMany between entry & tag

Following https://gist.github.com/Ocramius/3121916

Be sure to remove the related entity when removing an entity.

Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:

 - before that commit, the EntryTag will stay (at least using SQLite).
 - with that commit, the related entity is removed

Prepare wallabag 2.0.5

enforce older materialize version
2016-06-09 17:12:51 +02:00