aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3347 from Kdecherf/entry-statsNicolas Lœuillet2017-09-161-2/+7
|\ | | | | Entry view: update .stats margins and color
| * Entry view: update .stats margins and colorKevin Decherf2017-09-091-2/+7
| | | | | | | | | | | | | | | | 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>
* | Merge pull request #3345 from wallabag/Quent-in-patch-1Jérémy Benoist2017-09-091-1/+1
|\ \ | | | | | | Update messages.oc.yml
| * | Update messages.oc.ymlQuent-in2017-09-091-1/+1
|/ /
* | Merge pull request #3340 from Kdecherf/fix-webpackJérémy Benoist2017-09-072-2/+2
|\ \ | | | | | | Fix webpack error on comments
| * | Fix webpack error on commentsKevin Decherf2017-09-062-2/+2
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3309 from wallabag/fix-multiple-tag-searchJérémy Benoist2017-09-075-10/+36
|\ \ | | | | | | Multiple tag search, which was broken from API
| * | Remove unused functionJeremy Benoist2017-09-061-20/+0
| | | | | | | | | | | | Introduce after the rebase I guess
| * | Fix testsJeremy Benoist2017-09-062-2/+3
| | |
| * | Multiple tag search was broken from APIJeremy Benoist2017-09-065-10/+55
|/ / | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #3332 from nclsHart/better-txt-exportNicolas Lœuillet2017-09-062-2/+5
|\ \ | |/ |/| Better entry txt export using html2text
| * better entry txt export using html2textNicolas Hart2017-08-272-2/+5
| |
* | Merge pull request #3337 from strobeltobias/patch-1Jérémy Benoist2017-09-041-90/+90
|\ \ | | | | | | Add missing quotation marks and small fixes (2)
| * | Update messages.de.ymlJérémy Benoist2017-09-041-1/+1
| | |
| * | Update to comply with suggested changesTobias Strobel2017-09-031-7/+7
| | |
| * | Add missing quotation marks and small fixes (2)Tobias Strobel2017-09-011-90/+90
| | |
* | | Merge pull request #3333 from Quent-in/2.3Jérémy Benoist2017-09-034-60/+60
|\ \ \ | | | | | | | | Update OC
| * | | Update wallabag_user.oc.ymlQuent-in2017-08-301-2/+2
| | | |
| * | | Update CraueConfigBundle.oc.ymlQuent-in2017-08-301-1/+1
| | | |
| * | | Update validators.oc.ymlQuent-in2017-08-301-2/+2
| | | |
| * | | UpdateQuent-in2017-08-301-55/+55
| |/ /
* | | Merge pull request #3139 from Kdecherf/2502-tag-caseJérémy Benoist2017-09-036-6/+111
|\ \ \ | | | | | | | | Ignore tag's case
| * | | php-cs-fixer on DoctrineMigrations/Version20170719231144Kevin Decherf2017-08-271-24/+24
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Fix testsJeremy Benoist2017-08-271-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Add migration to change case of tagsKevin Decherf2017-08-271-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Tag: render tags case-insensitive by storing them in lowercaseKevin Decherf2017-08-274-5/+7
| | |/ | |/| | | | | | | | | | | | | Fixes #2502 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3338 from strobeltobias/patch-2Jérémy Benoist2017-09-031-36/+36
|\ \ \ | |_|/ |/| | Translate missing strings, add quotation marks
| * | Translate missing strings, add quotation marksTobias Strobel2017-09-011-36/+36
|/ /
* | Merge pull request #3330 from franek/set-starred-dateJérémy Benoist2017-08-306-7/+124
|\ \ | | | | | | Add starred_at field which is set when an entry is starred
| * | Set a starred_at field when an entry is starred.François D2017-08-256-7/+124
| |/ | | | | | | | | | | | | | | 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.
* | Merge pull request #3294 from wallabag/export-tag-nullJérémy Benoist2017-08-302-2/+2
|\ \ | |/ |/| Empty currentTag should be null
| * Empty currentTag should be nullJeremy Benoist2017-07-282-2/+2
| | | | | | | | And when a parameter is null, it won't appear in the url like `?tag=`.
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-08-222-4/+4
|\ \
| * \ Merge pull request #3323 from egilli/fix-export-link-with-baggyJérémy Benoist2017-08-141-3/+3
| |\ \ | | | | | | | | Fix export links in baggy theme
| | * | Fix export links in baggy themeÉtienne Gilli2017-08-131-3/+3
| |/ /
| * | Merge pull request #3322 from braco/patch-1Jérémy Benoist2017-08-121-1/+1
| |\ \ | | | | | | | | Update Readme with crucial information
| | * | Update Readme with crucial informationbraco2017-08-101-1/+1
| |/ /
* | | Merge pull request #3326 from nclsHart/reload-entry-commandJérémy Benoist2017-08-224-2/+224
|\ \ \ | | | | | | | | Add reload entry command
| * | | rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserIdNicolas Hart2017-08-222-2/+2
| | | |
| * | | rename getAllEntriesId into findAllEntriesIdByUserIdNicolas Hart2017-08-222-2/+2
| | | |
| * | | Add reload entry commandNicolas Hart2017-08-213-0/+222
|/ / /
* | | Merge pull request #3319 from Quent-in/2.3Jérémy Benoist2017-08-101-2/+2
|\ \ \ | | | | | | | | Translation : OC small changes
| * | | Small changeQuent-in2017-08-091-2/+2
| | | | | | | | | | | | Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC.
* | | | Merge pull request #3314 from nclsHart/fix-3313Jérémy Benoist2017-08-083-39/+23
|\ \ \ \ | | | | | | | | | | Reduce number of queries on tag list
| * | | | Reduce number of queries on tag listNicolas Hart2017-08-063-39/+23
| | | | |
* | | | | Merge pull request #3317 from wallabag/mruminski-patch-1Jérémy Benoist2017-08-081-13/+13
|\ \ \ \ \ | |/ / / / |/| | | | Update messages.pl.yml
| * | | | Update messages.pl.ymlMateusz Rumiński2017-08-081-13/+13
|/ / / / | | | | | | | | add polish translation for credentials
* | | | Merge pull request #3312 from Quent-in/2.3Jérémy Benoist2017-08-063-42/+42
|\| | | | | | | | | | | Occitan language updates
| * | | Correction apostrophe encadrée par simples apostrophesQuent-in2017-08-051-1/+1
| | | |
| * | | Correction indent. L538Quent-in2017-08-051-1/+1
| | | | | | | | | | | | Correction indentation suite rapport Travis
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 16:49:49 +0000