aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | UpdateQuent-in2017-08-051-3/+3
| | | | | | | | | | | | | | | | 2FA : choix des occitanophones interrogés : autentificacion en dos temps. + fautes de frappes
| * | | Update OC: correction fautes de frappeQuent-in2017-08-051-16/+16
| | | |
| * | | Update with new stringsQuent-in2017-08-051-21/+21
| | | | | | | | | | | | L538 : not quite sure about the number of space.
| * | | Update registration using APIQuent-in2017-08-051-2/+2
| | | |
* | | | Merge pull request #3311 from nclsHart/makefile-webpackJérémy Benoist2017-08-051-2/+2
|\ \ \ \ | |/ / / |/| | | Fix make build by replacing grunt with webpack
| * | | Fix make build by replacing grunt with webpackNicolas Hart2017-08-051-2/+2
| | | |
* | | | Merge pull request #3301 from nclsHart/list-user-commandJérémy Benoist2017-08-023-0/+149
|\ \ \ \ | |/ / / |/| | | Add list users command
| * | | add search argument and limit option to list users commandNicolas Hart2017-07-313-3/+83
| | | |
| * | | Add list user commandNicolas Hart2017-07-302-0/+69
|/ / /
* | | Merge pull request #3297 from nclsHart/commands-better-renderingJérémy Benoist2017-07-308-77/+78
|\ \ \ | | | | | | | | Better rendering for all core commands
| * | | Better rendering for all core commandsNicolas Hart2017-07-298-77/+78
| | |/ | |/|
* | | Merge pull request #3298 from nclsHart/fix-namespace-phpdocJérémy Benoist2017-07-309-8/+17
|\ \ \ | | | | | | | | Fix some namespaces and phpdoc
| * | | Fix some namespaces and phpdocNicolas Hart2017-07-299-8/+17
| | | |
* | | | Merge pull request #3299 from nclsHart/missing-method-prepare-entryJérémy Benoist2017-07-301-0/+2
|\ \ \ \ | |/ / / |/| | | Add missing abstract method prepareEntry in BrowserImport
| * | | Add missing abstract method prepareEntry in BrowserImportNicolas Hart2017-07-291-0/+2
|/ / /
* | | Merge pull request #3290 from nclsHart/fix-3019Jérémy Benoist2017-07-2914-1/+14
|\ \ \ | |/ / |/| | Add a dedicated title for all entries page
| * | add a dedicated title for all entries pageNicolas Hart2017-07-2714-1/+14
| | |
* | | Merge pull request #3291 from nclsHart/show-user-ioJérémy Benoist2017-07-281-10/+13
|\ \ \ | | | | | | | | Better rendering for show user command using symfony style
| * | | Better rendering for show user command using symfony styleNicolas Hart2017-07-271-10/+13
| |/ /
* | | Merge pull request #3292 from nclsHart/remove-getdoctrineJérémy Benoist2017-07-283-15/+0
|\ \ \ | | | | | | | | Remove unused method getDoctrine in several commands
| * | | Remove unused method getDoctrine in several commandsNicolas Hart2017-07-273-15/+0
| |/ /
* | | Merge pull request #3293 from nclsHart/remove-unused-useJérémy Benoist2017-07-281-1/+0
|\ \ \ | | | | | | | | Remove unused use statement in install command
| * | | Remove unused use statement in install commandNicolas Hart2017-07-271-1/+0
| |/ /
* | | Merge pull request #3280 from Simounet/fix/2.3-dateJérémy Benoist2017-07-252-2/+42
|\ \ \ | | | | | | | | Fix updatePublishedAt on already parsed article's date
| * | | Add a test for updatePublishedAtJeremy Benoist2017-07-242-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid error when a content is re-submitted and it previously add a published date. Also, fix the `testPostSameEntry`
| * | | Fix updatePublishedAt on already parsed article's dateSimounet2017-07-241-1/+1
| | | |
* | | | Merge pull request #3284 from wallabag/travis-7.2Jérémy Benoist2017-07-241-0/+2
|\ \ \ \ | |/ / / |/| | | Testing on PHP 7.2
| * | | Testing on PHP 7.2Jérémy Benoist2017-07-241-0/+2
|/ / /