aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into patch-1VirtualTam2018-06-261-0/+1
|\
| * Merge pull request #1164 from lapineige/patch-2VirtualTam2018-06-261-1/+1
| |\
| | * Other platform integration: add Yunohost install badge lapineige2018-06-251-1/+1
| |/
* / add Cloudron to related softwareFelix Bartels2018-06-251-1/+1
|/
* Merge pull request #1155 from shaarli/doc-improvementsnodiscc2018-06-216-173/+178
|\
| * Improve documentation (#598, #1105)nodiscc2018-06-176-173/+178
* | Merge pull request #1154 from virtualtam/changelogVirtualTam2018-06-204-11/+78
|\ \
| * | Update version badges and installation instructionsVirtualTam2018-06-202-6/+6
| * | Update AUTHORS and CHANGELOGVirtualTam2018-06-202-5/+72
| |/
* | Merge pull request #1158 from virtualtam/master-dockerfileVirtualTam2018-06-2023-261/+87
|\ \ | |/ |/|
| * docker: update image and usage documentationVirtualTam2018-06-172-7/+13
| * docker: build the images from the local sourcesVirtualTam2018-06-1713-127/+74
| * docker: remove 'stable' resourcesVirtualTam2018-06-164-127/+0
| * docker: move testing resources to tests/dockerVirtualTam2018-06-164-0/+0
|/
* Merge pull request #1152 from ArthurHoaro/hotfix/install-errorArthurHoaro2018-06-071-2/+3
|\
| * Fixes an error during the installArthurHoaro2018-06-071-2/+3
|/
* Merge pull request #1151 from kramred/masterArthurHoaro2018-06-071-0/+1
|\
| * remove environment specific .gitignore entriesMark Schmitz2018-06-071-5/+0
| * Merge remote-tracking branch 'upstream/master'Mark Schmitz2018-06-0759-1610/+4212
| |\ | |/ |/|
* | Merge pull request #1143 from ArthurHoaro/sort-equal-tagsArthurHoaro2018-06-042-8/+121
|\ \
| * | Tag sort - UT + comment + fix filter and visibilityArthurHoaro2018-05-292-7/+118
| * | Fix order of tags with the same number of occurrencesArthurHoaro2018-05-191-2/+4
* | | Merge pull request #1086 from virtualtam/refactor/loginVirtualTam2018-06-0323-563/+1116
|\ \ \
| * | | SessionManager+LoginManager: fix checkLoginState logicVirtualTam2018-06-023-7/+15
| * | | Add test coverage for LoginManager methodsVirtualTam2018-06-024-11/+161
| * | | SessionManager: remove unused UID tokenVirtualTam2018-06-022-19/+0
| * | | Refactor LoginManager stay-signed-in token managementVirtualTam2018-06-024-14/+69
| * | | Refactor session and cookie timeout controlVirtualTam2018-06-024-57/+224
| * | | Move LoginManager and SessionManager to the Security namespaceVirtualTam2018-06-026-7/+8
| * | | LoginManager: remove unused parameterVirtualTam2018-06-022-3/+2
| * | | Login: update PageBuilder and default/vintage templatesVirtualTam2018-06-0212-30/+38
| * | | Pass the client IP ID to LoginManagerVirtualTam2018-06-022-17/+16
| * | | Delegate session operations to SessionManagerVirtualTam2018-06-022-24/+69
| * | | Document LoginManager propertiesVirtualTam2018-05-291-0/+11
| * | | Refactor user credential validation at login timeVirtualTam2018-05-293-111/+146
| * | | Refactor PHP session handling during login/logoutVirtualTam2018-05-292-36/+53
| * | | Refactor SessionManager::$INACTIVITY_TIMEOUTVirtualTam2018-05-292-24/+28
| * | | Refactor client session hijacking protectionVirtualTam2018-05-293-13/+86
|/ / /
* | | Merge pull request #1135 from ArthurHoaro/ci/csslintArthurHoaro2018-05-2920-958/+1444
|\ \ \
| * | | Add SASSLint makefile target, and run it in CIArthurHoaro2018-05-108-14/+312
| * | | Add classes to default template to avoid using IDs in SCSSArthurHoaro2018-05-1011-15/+15
| * | | Reformat default theme SCSS to match SASS rulesArthurHoaro2018-05-101-929/+1117
* | | | Merge pull request #1140 from ArthurHoaro/hotfix/markdown-rss-permalinkArthurHoaro2018-05-292-0/+63
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix feed permalink rendering with markdown escape set to trueArthurHoaro2018-05-192-0/+63
|/ / /
* | | Merge pull request #1138 from ArthurHoaro/stakaliArthurHoaro2018-05-172-3/+11
|\ \ \ | |/ / |/| |
| * | Adds Stakali Android app to 3rd party listsArthurHoaro2018-05-132-3/+11
|/ /
* | Merge pull request #1116 from ArthurHoaro/ci/eslintArthurHoaro2018-05-062-11/+32
|\ \
| * | Use Travis stages to run JS tests separatelyArthurHoaro2018-05-052-11/+32
|/ /
* | Merge pull request #1133 from ArthurHoaro/hotfix/title-dlArthurHoaro2018-05-022-5/+14
|\ \
| * | Support redirection in cURL download callbackArthurHoaro2018-05-011-4/+13
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 21:50:17 +0000