mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-10-02 00:01:59 +00:00
Code Issues Projects Releases Wiki Activity
2566 commits 10 branches 99 tags 158 MiB
Commit graph

2566 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Citharel
029965b6a2 Merge pull request #2200 from charno6/patch-1 
Fixed typo in entry:notice:entry_saved
 2016-07-23 22:58:26 +02:00
charno6
75ac3e6289 Fixed typo in entry:notice:entry_saved 
"Eintag" to "Eintrag"
 2016-07-23 22:40:23 +02:00
Jeremy Benoist
8c7d7c0300 Merge pull request #2199 from Simounet/facto/social-links 
Handling socials links into a config file
 2016-07-21 16:17:53 +02:00
Simounet
57c608fa94 php-cs-fixer pass 2016-07-20 23:08:04 +02:00
Simounet
40288b7166 Chrome extension URL updated 2016-07-20 22:55:43 +02:00
Thomas Citharel
78d1727096 Merge pull request #2198 from Simounet/fix/image-inside-figure 
FIX image inside a figure element max-width
 2016-07-20 20:44:47 +02:00
Simounet
0e1abf392c FIX image inside a figure element max-width (baggy theme) 2016-07-20 20:23:55 +02:00
Simounet
f64472e9f8 FIX image inside a figure element max-width 2016-07-20 19:39:24 +02:00
Simounet
39f27d6370 Handling socials links into a config file 2016-07-20 19:36:01 +02:00
Nicolas Lœuillet
317fc6e684 Merge pull request #2195 from wallabag/remove-bin 
Remove binary from repo
 2016-07-20 11:38:55 +02:00
Jeremy Benoist
8d8d48a2bb Remove binary from repo 
Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.

⚠️ You have to update your Composer to the 1.2 (`composer selfupdate`)
 2016-07-20 10:51:37 +02:00
Nicolas Lœuillet
0dc09439ef Merge pull request #2048 from wallabag/travis-php-7.1 
Run PHP 7.1 on Travis
 2016-07-19 11:24:26 +02:00
Jeremy Benoist
ab3eb4ba95 Merge pull request #2194 from benages/patch-2 
Fixed spelling Artúclos --> Artículos
 2016-07-18 22:56:02 +02:00
benages
57b62cbf79 Fixed spelling Artúclos --> Artículos 2016-07-18 21:53:53 +02:00
Jeremy Benoist
1973897305 Run PHP 7.1 on Travis 
- Using nightly (as of now it's PHP 7.1 alpha)
- Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7)
 2016-07-18 18:07:25 +02:00
Thomas Citharel
51cbc2ebfe Merge pull request #2185 from wallabag/fix-3rd-party-links 
Fix 3rd-Party Apps links (Chrome & Firefox)
 2016-07-02 12:33:33 +02:00
Thomas Citharel
8d4152f70d
Remove fr part 2016-07-02 11:56:14 +02:00
Thomas Citharel
baef8ea26c
Fix 3rd-Party Apps links (Chrome & Firefox) 2016-07-02 11:50:32 +02:00
Nicolas Lœuillet
9f8c43e222 Merge pull request #2172 from wallabag/more-tests 
Change the way to login user in tests
 2016-06-24 14:22:47 +02:00
Jeremy Benoist
fdc90ceb17 Change the way to login user in tests 
Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.

Also, fix a bad config name in fos_user for firewall

And finally, add functional test to PocketImport
 2016-06-24 11:55:47 +02:00
Jeremy Benoist
2bc9cad78e Remove useless spaces 2016-06-24 11:28:07 +02:00
Jeremy Benoist
fb5c17a9ab Merge pull request #2157 from wallabag/lower-upper-readingtime 
Handle only upper or only lower reading filter
 2016-06-23 11:38:10 +02:00
Jeremy Benoist
95859e54c5 Add some tests about readingTime 2016-06-23 10:46:47 +02:00
Jeremy Benoist
bf27f99d54 Merge pull request #2165 from wallabag/translation-typos 
Fix a few french translations typos
 2016-06-23 10:43:06 +02:00
Jeremy Benoist
2c00dddf01 fixup! Handle only upper or only lower reading filter 2016-06-23 09:41:30 +02:00
Jeremy Benoist
1bdbc39f02 Handle only upper or only lower reading filter 
When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).
 2016-06-23 09:41:30 +02:00
Thomas Citharel
b46124cb9b Fix a few french translations typos 2016-06-23 09:38:49 +02:00
Nicolas Lœuillet
d37bb05c88 Merge pull request #2132 from wallabag/sf3.1 
Jump to Symfony 3.1
 2016-06-23 09:18:18 +02:00
Jeremy Benoist
99451fe4b7 Fix bad loading fixtures 
Since doctrine/data-fixtures 1.2.0 fixtures seems to be badly loaded.
No time for investigate but reverting back to 1.1.* is fixing issues.
 2016-06-22 23:15:17 +02:00
Jeremy Benoist
23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
Nicolas Lœuillet
891a026e31 Merge pull request #2160 from wallabag/bin-cs-fixer 
Update symlink to php-cs-fixer
 2016-06-20 12:11:53 +02:00
Jeremy Benoist
2f30eed236 Update symlink to php-cs-fixer 2016-06-20 11:22:30 +02:00
Nicolas Lœuillet
247cf4897a Merge pull request #2155 from wallabag/php-cs-fixer 
Use friendsofphp instead of fabpot
 2016-06-20 09:35:55 +02:00
Nicolas Lœuillet
3c552f0d04 Merge pull request #2156 from wallabag/delete-redirect 
Try to find bad redirection after delete
 2016-06-20 09:35:41 +02:00
Jeremy Benoist
ce0e9ec31b Try to find bad redirection after delete 
Instead of checking for the whole absolute url, we just check with the relative url.
If the referer ends with the relative url of the deleted entry, don't redirect to the referer.
 2016-06-17 22:18:48 +02:00
Jeremy Benoist
d71b600599 Use friendsofphp instead of fabpot 
The fabpot's one is now depreacted
 2016-06-17 22:03:29 +02:00
Jeremy Benoist
77c530f43c Merge pull request #2148 from wallabag/start-german-docu 
translate documentation to German
 2016-06-16 06:50:21 +02:00
Sven Fischer
429480357f translate documentation to German 2016-06-16 00:39:48 +02:00
Jeremy Benoist
d220a95121 Merge pull request #2145 from even-allmighty/master 
Corrected Regex for lighttpd rewrite
 2016-06-13 11:51:37 +02:00
Even Allmighty
02d10905b3 Corrected Regex for lighttpd rewrite 2016-06-13 10:35:05 +02:00
Nicolas Lœuillet
1584067028 Merge pull request #2118 from wallabag/prepare-205 
Prepare wallabag 2.0.5
 2016-05-31 21:45:01 +02:00
Nicolas Lœuillet
17dfff6918 Prepare wallabag 2.0.5 2016-05-31 21:18:22 +02:00
Nicolas Lœuillet
f329e769fd Merge pull request #2122 from wallabag/fix-tags-deletion 
Fix the deletion of Tags/Entries relation when delete an entry
 2016-05-31 11:31:16 +02:00
Jeremy Benoist
3be047456d 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
 2016-05-31 10:01:03 +02:00
Jeremy Benoist
39ba51ca1a 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.
 2016-05-30 14:32:43 +02:00
Jeremy Benoist
2c045a210a Move fixtures to the right place 2016-05-30 14:18:47 +02:00
Nicolas Lœuillet
f41c840b8c
Fix the deletion of Tags/Entries relation when delete an entry 
Fix #2121
 2016-05-28 13:38:59 +02:00
Jeremy Benoist
839475776b Merge pull request #2052 from danbartram/feature-filter-unread 
Add unread filter to entries pages
 2016-05-27 09:57:51 +02:00
Nicolas Lœuillet
7b67f785ff Merge pull request #2112 from Poorchop/docs-proposal 
Docs proposal
 2016-05-26 20:50:11 +02:00
Nicolas Lœuillet
c15a150d2e Merge pull request #2111 from wallabag/translate-android-docu-pics-to-english 
add screenshots of android docu in English
 2016-05-24 13:41:56 +02:00