aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* Rebase: new config manager, search criteria, and private linksArthurHoaro2016-08-072-27/+33
* Edit link WIP + upgrade awesompleteArthurHoaro2016-08-075-376/+510
* addlink templateArthurHoaro2016-08-073-8/+35
* Login page and header loginArthurHoaro2016-08-078-28/+230
* Work in progress: linklist, header and footerArthurHoaro2016-08-079-86/+548
* Add Fira Sans fontArthurHoaro2016-08-071-4/+35
* Fold/Expand shaaresArthurHoaro2016-08-071-0/+4
* linklist toolbar (tags, permalink, etc)ArthurHoaro2016-08-071-2/+22
* Linklist improvementsArthurHoaro2016-08-074-28/+30
* Add Fira Sans fontArthurHoaro2016-08-074-8/+55
* Fold/Expand shaaresArthurHoaro2016-08-072-0/+53
* Linklist templateArthurHoaro2016-08-073-75/+270
* Linklist pagingArthurHoaro2016-08-073-26/+135
* Desktop search fieldsArthurHoaro2016-08-078-26/+57
* Shaarli header templateArthurHoaro2016-08-073-96/+144
* Shaarli header templateArthurHoaro2016-08-071-0/+0
* Work on the menuArthurHoaro2016-08-0713-1/+2807
* Initialize default template with Pure CSS and Font AwesomeArthurHoaro2016-08-0713-0/+2773
* Merge pull request #628 from ArthurHoaro/hotfix/default-privateArthur2016-08-071-1/+1
|\
| * Bugfix: wrong key used to get default private links settingArthurHoaro2016-08-071-1/+1
|/
* Merge pull request #627 from ArthurHoaro/feature/translate-initArthur2016-08-073-0/+63
|\
| * Initialize a translation functionArthurHoaro2016-08-073-0/+63
|/
* Merge pull request #625 from ArthurHoaro/tokenVirtualTam2016-08-072-9/+1
|\
| * Generate a token for every pagesArthurHoaro2016-08-062-9/+1
* | Merge pull request #626 from ArthurHoaro/hotfix/changepasswordVirtualTam2016-08-071-1/+1
|\ \ | |/ |/|
| * Bugfix: enable change password if open shaarli is disabledArthurHoaro2016-08-061-1/+1
|/
* Merge pull request #621 from ArthurHoaro/hotfix/update-escape-configVirtualTam2016-08-022-2/+26
|\
| * Fix update method escapeUnescapedConfigArthurHoaro2016-08-022-2/+26
* | Merge pull request #618 from ArthurHoaro/tagcleanVirtualTam2016-08-023-3/+7
|\ \ | |/ |/|
| * Better whitespace handling in tagsArthurHoaro2016-08-023-28/+6
| * add unit testChris Kuethe2016-08-021-0/+26
| * Better whitespace handling in tags. Fixes #571Chris Kuethe2016-08-021-2/+2
|/
* Merge pull request #608 from virtualtam/refactor/bookmark-parserVirtualTam2016-07-263-8/+47
|\
| * Makefile: generate release archives including 3rd-party librariesVirtualTam2016-07-252-7/+39
| * Composer: add shaarli/netscape-bookmark-parserVirtualTam2016-07-231-1/+8
|/
* Merge pull request #605 from ArthurHoaro/clean-phpunitArthur2016-07-232-0/+6
|\
| * Hide expected 'error_log' while running TU (clean PHPUnit log)ArthurHoaro2016-07-232-0/+6
* | Merge pull request #604 from ArthurHoaro/no-deliciousArthur2016-07-232-2/+2
|\ \
| * | Remove Delicious in project description in commentsArthurHoaro2016-07-232-2/+2
| |/
* | Merge pull request #601 from ArthurHoaro/hotfix/title-missingArthur2016-07-232-15/+7
|\ \
| * | Fixes #600 - Shaarli's title is not set with the new config managerArthurHoaro2016-07-192-15/+7
| |/
* | Merge pull request #603 from julienCXX/pr-fix-test-method-nameArthur2016-07-211-2/+2
|\ \
| * | Fix typo in test method namejulienCXX2016-07-211-2/+2
|/ /
* | Merge pull request #596 from ArthurHoaro/hotfix/pluginmanager-tpl-varArthur2016-07-102-1/+2
|\ \ | |/ |/|
| * Fix variable in configure.phpArthurHoaro2016-07-102-1/+2
|/
* Merge pull request #558 from ArthurHoaro/hashtag4Arthur2016-07-0910-103/+270
|\
| * Hashtag systemArthurHoaro2016-06-0610-104/+271
* | Merge pull request #570 from ArthurHoaro/config-managerArthur2016-07-0941-1130/+2096
|\ \
| * | Add closing PHP tags to JSON config filesArthurHoaro2016-06-204-2/+18
| * | Pass the configuration manager to templatesArthurHoaro2016-06-151-0/+2