mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-23 09:31:04 +00:00
Code Issues Projects Releases Wiki Activity
4096 commits 12 branches 100 tags 170 MiB
Commit graph

4096 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jérémy Benoist
23246a5da6 Merge pull request #3345 from wallabag/Quent-in-patch-1 
Update messages.oc.yml
 2017-09-09 18:57:50 +02:00
Quent-in
f764407daf Update messages.oc.yml 2017-09-09 18:23:59 +02:00
Jérémy Benoist
061fca8c6e Merge pull request #3340 from Kdecherf/fix-webpack 
Fix webpack error on comments
 2017-09-07 07:17:05 +02:00
Jérémy Benoist
f6d042f56d Merge pull request #3309 from wallabag/fix-multiple-tag-search 
Multiple tag search, which was broken from API
 2017-09-07 07:16:26 +02:00
Jeremy Benoist
9c4a7388da
Remove unused function 
Introduce after the rebase I guess
 2017-09-06 22:58:35 +02:00
Jeremy Benoist
33264c2d02
Fix tests 2017-09-06 22:49:16 +02:00
Jeremy Benoist
7c04b7396a
Multiple tag search was broken from API 
First, the setParameter() were done on the same parameter which in fact
just duplicated the condition in the SQL query (like `where t.label =
'test' and t.label = 'test'`.

Changed the parameter doesn't help because the query was then wrong.

Changing the way to match associated tags for an entry and it worked.
 2017-09-06 22:49:15 +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
Nicolas Lœuillet
78b36d4dbe Merge pull request #3332 from nclsHart/better-txt-export 
Better entry txt export using html2text
 2017-09-06 15:08:12 +02:00
Jérémy Benoist
b9c26b6330 Merge pull request #3337 from strobeltobias/patch-1 
Add missing quotation marks and small fixes (2)
 2017-09-04 12:09:26 +02:00
Jérémy Benoist
e85657fb10 Update messages.de.yml 2017-09-04 11:17:26 +02:00
Jérémy Benoist
f3e688207d Merge pull request #3333 from Quent-in/2.3 
Update OC
 2017-09-03 20:26:16 +02:00
Jérémy Benoist
3af5d41759 Merge pull request #3139 from Kdecherf/2502-tag-case 
Ignore tag's case
 2017-09-03 20:25:15 +02:00
Jérémy Benoist
9c4d1eb56a Merge pull request #3338 from strobeltobias/patch-2 
Translate missing strings, add quotation marks
 2017-09-03 20:24:41 +02:00
Tobias Strobel
bcb10aeef8 Update to comply with suggested changes 2017-09-03 15:15:38 +02:00
Tobias Strobel
973392cc48 Translate missing strings, add quotation marks 2017-09-01 23:15:18 +02:00
Tobias Strobel
6c2a56458b Add missing quotation marks and small fixes (2) 2017-09-01 23:01:57 +02:00
Quent-in
442147d923 Update wallabag_user.oc.yml 2017-08-30 20:10:58 +02:00
Quent-in
a09136d2d2 Update CraueConfigBundle.oc.yml 2017-08-30 20:09:16 +02:00
Quent-in
de4bbe4968 Update validators.oc.yml 2017-08-30 20:06:34 +02:00
Quent-in
9f33293b7e Update 2017-08-30 20:01:11 +02:00
Jérémy Benoist
119e6c5edb Merge pull request #3330 from franek/set-starred-date 
Add starred_at field which is set when an entry is starred
 2017-08-30 13:53:49 +02:00
Jérémy Benoist
854616ac6d Merge pull request #3294 from wallabag/export-tag-null 
Empty currentTag should be null
 2017-08-30 13:51:20 +02:00
Kevin Decherf
7b4f66881d php-cs-fixer on DoctrineMigrations/Version20170719231144 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-08-27 16:59:02 +02:00
Jeremy Benoist
e437ad810b Fix tests 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-08-27 16:51:23 +02:00
Kevin Decherf
bd164a75c4 Add migration to change case of tags 
This migration does not support SQLite as long as this engine does not
support Unicode in LOWER().

This migration starts by retrieving the list of lowercase tags which
need to be migrated. Then it retrieves the list of tags for each tags
from the previous step in order to migrate entries. It handles deletion
of empty tags. At the end the migration makes a full scan to update the
label of all remaining tags.

WARNING: THIS MIGRATION IS IRREVERSIBLE.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-08-27 16:51:23 +02:00
Kevin Decherf
7036d91fe7 Tag: render tags case-insensitive by storing them in lowercase 
Fixes #2502

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-08-27 16:51:23 +02:00
Nicolas Hart
c660878388 better entry txt export using html2text 2017-08-27 00:04:21 +02:00
François D
a991c46eed Set a starred_at field when an entry is starred. 
This date is used to sort starred entries.

Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated.
Add an updateStar method into Entry class
A migration script has been added in order to set starred_at field.
 2017-08-25 21:19:47 +02:00
Jeremy Benoist
2490f61dca
Merge remote-tracking branch 'origin/master' into 2.3 2017-08-22 11:22:47 +02:00
Jérémy Benoist
54171dd796 Merge pull request #3326 from nclsHart/reload-entry-command 
Add reload entry command
 2017-08-22 11:21:04 +02:00
Nicolas Hart
dbf1188c5b rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserId 2017-08-22 10:42:54 +02:00
Nicolas Hart
215409a8b2 rename getAllEntriesId into findAllEntriesIdByUserId 2017-08-22 10:41:28 +02:00
Nicolas Hart
511f1ce1e8 Add reload entry command 2017-08-21 10:45:48 +02:00
Jérémy Benoist
d83d25dade Merge pull request #3323 from egilli/fix-export-link-with-baggy 
Fix export links in baggy theme
 2017-08-14 17:45:16 +02:00
Étienne Gilli
aa29fc4ec6 Fix export links in baggy theme 2017-08-13 18:03:32 +02:00
Jérémy Benoist
73b3d449b1 Merge pull request #3322 from braco/patch-1 
Update Readme with crucial information
 2017-08-12 09:32:51 +02:00
braco
d0804524a1 Update Readme with crucial information 2017-08-10 14:54:58 -04:00
Jérémy Benoist
4d2758dfa0 Merge pull request #3319 from Quent-in/2.3 
Translation : OC small changes
 2017-08-10 10:13:09 +02:00
Quent-in
0d7d472c91 Small change 
Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC.
 2017-08-09 18:40:19 +02:00
Jérémy Benoist
86ecd2b543 Merge pull request #3314 from nclsHart/fix-3313 
Reduce number of queries on tag list
 2017-08-08 19:48:47 +02:00
Jérémy Benoist
aff1dd4ff1 Merge pull request #3317 from wallabag/mruminski-patch-1 
Update messages.pl.yml
 2017-08-08 19:38:43 +02:00
Mateusz Rumiński
e86ee7fd1e Update messages.pl.yml 
add polish translation for credentials
 2017-08-08 15:45:44 +02:00
Nicolas Hart
935e9fffb4 Reduce number of queries on tag list 2017-08-06 23:02:32 +02:00
Jérémy Benoist
f11a3cf21c Merge pull request #3312 from Quent-in/2.3 
Occitan language updates
 2017-08-06 15:39:04 +02:00
Quent-in
1aa5b75804 Correction apostrophe encadrée par simples apostrophes 2017-08-05 20:20:18 +02:00
Quent-in
efeaadcf9d Correction indent. L538 
Correction indentation suite rapport Travis
 2017-08-05 19:48:45 +02:00
Jérémy Benoist
fccc3a2e07 Merge pull request #3311 from nclsHart/makefile-webpack 
Fix make build by replacing grunt with webpack
 2017-08-05 19:19:09 +02:00