Commit graph

2624 commits

Author SHA1 Message Date
Jeremy Benoist 0184e09a66
Add missing translations 2016-08-28 15:37:22 +02:00
Nicolas Lœuillet d5d1612153
Add tests for untagged entries 2016-08-28 14:44:00 +02:00
Nicolas Lœuillet b6520f0b15
Add untagged entries
Fix #1631
2016-08-28 14:44:00 +02:00
Jeremy Benoist 8635ab1cd1 Merge pull request #2245 from wallabag/change-page-title
Changed where page title is displayed
2016-08-28 14:33:46 +02:00
Nicolas Lœuillet 74d68fbf25
Changed where page title is displayed 2016-08-26 21:26:21 +02:00
Jeremy Benoist c4da9d1cd8 Merge pull request #2240 from wallabag/add-icon-public-share
Add icon for public share link
2016-08-26 12:14:36 +02:00
Nicolas Lœuillet 8e06720ff3
Add icon for public share link 2016-08-25 16:19:21 +02:00
Nicolas Lœuillet aad350a5a2 Merge pull request #2237 from wallabag/add-original-url-public-entry
Add original link in public view of the article
2016-08-25 15:39:15 +02:00
Nicolas Lœuillet 0a512eaf57
Remove text about original URL in public view 2016-08-25 15:32:38 +02:00
Nicolas Lœuillet 9415bc992e
Add original link in public view of the article 2016-08-25 14:39:33 +02:00
Jeremy Benoist 60e7220406 Merge pull request #1904 from wallabag/feature-public-mode
Share entry with a public URL
2016-08-25 09:30:51 +02:00
Jeremy Benoist eddda878a0
Update test
and some cleanup
2016-08-24 22:29:36 +02:00
Jeremy Benoist b1afef30dc
Handle share_entry
- share_entry needs to be in the migration too
- and it needs a translation
2016-08-24 21:56:02 +02:00
Jeremy Benoist ad9304cd7e
Handle table prefix in migration
and fix migration for name field in oauth table
2016-08-24 21:38:26 +02:00
Jeremy Benoist a1ab7d1d32 Merge pull request #2186 from wallabag/addRegistration
Add option to disable registration
2016-08-24 11:13:00 +02:00
Nicolas Lœuillet 8541b3c4fd
Add simple test 2016-08-24 10:28:43 +02:00
Nicolas Lœuillet 78b3c31d70
Change annotation for uuid field 2016-08-24 09:07:49 +02:00
Nicolas Lœuillet 3e860ff1ce
Change links on baggy theme 2016-08-23 16:55:49 +02:00
Nicolas Lœuillet f1be7af446 Change share entry behavior 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet 3377c938f8 Add translations 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet 9a5231e8c4 Improve migration 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet a7e2218e25 Add test and fix migration 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet 222e09f140 Add Cache on Share Action 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet d0545b6bd6 Add migration 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet f3d0cb9106 Share entry with a public URL 2016-08-23 16:49:21 +02:00
Nicolas Lœuillet 1bee9e0760 Merge pull request #2218 from wallabag/api-delete-tags-1982
Delete tag or tags by label
2016-08-23 11:51:13 +02:00
Jeremy Benoist ee4442f42a
CS 2016-08-23 07:40:36 +02:00
Thomas Citharel 7149aa5781
Proper parameter name, simplify logic & phpdoc 2016-08-23 07:40:36 +02:00
Thomas Citharel de3d716ae4
Add option to disable registration 2016-08-23 07:40:36 +02:00
Jeremy Benoist 97e7ad4dc7
Remove duplicate pager on baggy 2016-08-23 07:36:43 +02:00
Jeremy Benoist a0e1eafc35
Add some tests
Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test).

Moved down `deleteTagAction` because it conflicted with the new action:

  api_delete_tag => /api/tags/{tag}.{_format}
  api_delete_tags_label => /api/tags/label.{_format}

And finally, throw exception when a tag is not found before removing it.
2016-08-23 07:26:58 +02:00
Thomas Citharel 9bf83f1fb8
CS 2016-08-23 07:26:58 +02:00
Thomas Citharel 4da01f492b
Delete tag or tags by label
Tests not included
2016-08-23 07:26:58 +02:00
Jeremy Benoist e71cef0bb8
Fix typos in field name 2016-08-23 07:26:58 +02:00
Thomas Citharel 119914e65d
added name on client 2016-08-23 07:26:58 +02:00
Nicolas Lœuillet 267e8d6361
Add tests for tag list routes 2016-08-23 07:26:18 +02:00
Nicolas Lœuillet 371bcca0f6
Translations and baggy view for tags 2016-08-23 07:26:18 +02:00
Nicolas Lœuillet 891456ba9a
Links on each tag in Tags view 2016-08-23 07:24:42 +02:00
Jeremy Benoist 79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Thomas Citharel 9c545fe028
Added name on client
- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
2016-08-22 20:18:27 +02:00
Jeremy Benoist db4d63fc1a
Upgrade PHPUnit to version 5
- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2201
2016-08-22 20:16:50 +02:00
Nicolas Lœuillet 80bb0b7344 Merge pull request #2226 from wallabag/prepare-207
Prepare wallabag 2.0.7
2016-08-22 10:40:24 +02:00
Nicolas Lœuillet 5068544e10
Prepare wallabag 2.0.7 2016-08-22 10:08:21 +02:00
Nicolas Lœuillet c649d43381 Merge pull request #2222 from wallabag/add-date-on-article-view
Added creation date and reading time on article view
2016-08-22 09:40:21 +02:00
Jeremy Benoist d35ba2c3d6
Display text on baggy
Instead of using icons (which aren't available) display real text for reading time & creation date
2016-08-21 22:22:34 +02:00
Jeremy Benoist 4e4e8e9899 Merge pull request #2221 from wallabag/replace-favorite-star
Replaced favorite word/icon with star one
2016-08-21 22:11:20 +02:00
Thomas Citharel 8642f14220 Merge pull request #2224 from wallabag/avoid-exception-import
Avoid breaking import when fetching fail
2016-08-20 14:31:32 +02:00
Jeremy Benoist 19d9efab32
Avoid breaking import when fetching fail
graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.
2016-08-20 01:17:26 +02:00
Nicolas Lœuillet e7732deb1f Changed code indentation 2016-08-18 15:37:44 +02:00
Nicolas Lœuillet eecd7e406d
Fixed some translations 2016-08-18 15:30:28 +02:00