Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
900 commits 8 branches 1 tag 9.7 MiB
Commit graph

900 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ArthurHoaro dcc85ea619 Merge pull request #798 from ArthurHoaro/feature/composer-lock 
Include composer.lock in git files
 2017-03-22 18:51:20 +01:00
ArthurHoaro 64c34078e4 Merge pull request #816 from ArthurHoaro/project/master-version 
Use 'dev' version on the master branch
 2017-03-22 18:50:33 +01:00
VirtualTam 36eb71fb48 Merge pull request #826 from virtualtam/readme/badges 
README: use explicit version badges
 2017-03-21 21:57:17 +01:00
ArthurHoaro 1c070fa812 Include composer.lock in git files 2017-03-21 20:13:13 +01:00
ArthurHoaro c4c655d9bf Merge pull request #804 from ArthurHoaro/feature/atom-default 
Fixes #304: use atom feed as default
 2017-03-21 20:10:49 +01:00
ArthurHoaro b786c8836f Set Shaarli's version only in shaarli_version.php file 2017-03-21 20:08:40 +01:00
ArthurHoaro 4bad4bde5a Merge pull request #817 from ArthurHoaro/feature/json-conf-parsing 
Proper error if the conf file is invalid instead of fatal error
 2017-03-21 20:04:09 +01:00
VirtualTam 643b631281 README: use explicit version badges 
Closes https://github.com/shaarli/Shaarli/issues/823

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-03-19 18:50:53 +01:00
ArthurHoaro 5c0e68c071 Merge pull request #815 from ArthurHoaro/theme/display-version 
Theme: display shaarli version in the footer when logged in
 2017-03-12 16:10:15 +01:00
ArthurHoaro c6a4c2882d Proper error if the conf file is invalid instead of fatal error 
Error:

An error occurred while parsing configuration JSON file (data/config.json.php): error code #4
➜ Syntax error
Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as jsonlint.com.
 2017-03-12 16:09:34 +01:00
ArthurHoaro bbc6b844c1 Add an updateMethod to match the current remote branch for updates 2017-03-12 15:28:23 +01:00
ArthurHoaro b897c81f8c Use 'dev' version on the master branch 
Allowed check branches are now `latest` and `stable`.
 2017-03-12 15:05:59 +01:00
ArthurHoaro 8294195677 Theme: display shaarli version in the footer when logged in 
Fixes #778
 2017-03-12 14:52:44 +01:00
ArthurHoaro 7fc5f07492 Merge pull request #813 from ArthurHoaro/changelog 
Update changelog
 2017-03-12 14:45:46 +01:00
ArthurHoaro 89284d554d Update changelog 2017-03-12 14:03:19 +01:00
ArthurHoaro 6e0a1310a2 Merge pull request #811 from ArthurHoaro/theme/awesomplete-overflow 
Fixes #806: display overflow for awesomplete list
 2017-03-12 13:52:35 +01:00
ArthurHoaro f8a8973f42 Merge pull request #812 from ArthurHoaro/theme/configure-valign 
Theme: Vertical align theme select in configure
 2017-03-12 13:52:23 +01:00
ArthurHoaro 7cea7c7a9a Theme: Vertical align theme select in configure 
Fixes #807
 2017-03-12 13:42:21 +01:00
ArthurHoaro 15162272f4 Fixes #806: display overflow for awesomplete list 2017-03-12 13:28:37 +01:00
ArthurHoaro 5eca4ea11e Merge pull request #809 from ArthurHoaro/cleanup/inline-js 
Remove inline JS and add LibreJS headers in JS files
 2017-03-12 12:59:05 +01:00
ArthurHoaro b9b41d25e3 Remove inline JS and add LibreJS headers in JS files 
Fixes #33 (wow!)
Relates to #395
 2017-03-12 12:45:32 +01:00
ArthurHoaro cffc5ce3d1 Merge pull request #808 from ArthurHoaro/demo-readme 
Shaarli demo moved to shaarli.org
 2017-03-11 20:32:35 +01:00
ArthurHoaro 3252fbb3cc Shaarli demo moved to shaarli.org 2017-03-11 20:27:35 +01:00
ArthurHoaro 196808e14f Merge pull request #779 from ArthurHoaro/feature/import-parser-logs 
Link imports are now logged in `data/` folder, and can be debug using…
 2017-03-11 14:23:05 +01:00
ArthurHoaro c4f8360240 Merge pull request #803 from ArthurHoaro/feature/awesomplete-autofirst 
Fixes #657: use data-autofirst parameter for awesomeplete
 2017-03-11 14:20:55 +01:00
ArthurHoaro c904bccce1 Merge pull request #805 from ArthurHoaro/mobile-logo 
Fixes #793: display the star logo on mobile instead of home logo
 2017-03-11 14:20:40 +01:00
ArthurHoaro 6fcb443787 Fixes #793: display the star logo on mobile instead of home logo 2017-03-11 14:19:59 +01:00
ArthurHoaro 2ea89aba4f Fixes #304: use atom feed as default 
RSS feed is still available with the  setting set to false
 2017-03-11 14:13:58 +01:00
ArthurHoaro 1739d6b314 Merge pull request #799 from ArthurHoaro/plugins/piwik-url 
Fix #773: set Piwik URL protocol
 2017-03-11 13:52:00 +01:00
ArthurHoaro 792b26789f Fixes #657: use data-autofirst parameter for awesomeplete 
data-autofirst automatically selects the first item of the list of choice automatically. You just have to press enter to use it.
 2017-03-11 13:48:47 +01:00
ArthurHoaro fe83d45c46 Fix #773: set Piwik URL protocol 2017-03-11 13:27:02 +01:00
ArthurHoaro 87e9631e4a Fix namespace issue 2017-03-10 18:49:53 +01:00
ArthurHoaro c31f3ce048 Upgrade netscape-bookmark-parser dependency to v2.x 2017-03-10 18:46:53 +01:00
ArthurHoaro 48417aed1d Link imports are now logged in data/ folder, and can be debug using dev.debug=true setting 
related to #741 and #681
 2017-03-10 18:46:53 +01:00
ArthurHoaro 844021ab4c Merge pull request #797 from ArthurHoaro/hotfix/font-git 
Prevent git from messing with font files
 2017-03-09 20:10:14 +01:00
ArthurHoaro 16a2ef6b5a Merge pull request #794 from ArthurHoaro/hotfix/namespace 
Move config exception to dedicated classes with proper namespace
 2017-03-09 19:45:52 +01:00
ArthurHoaro 07b57cfef9 Prevent git from messing with font files 
This should remove font related errors in browser debig consoles
 2017-03-09 19:41:32 +01:00
ArthurHoaro 5ba55f0cf2 Move config exception to dedicated classes with proper namespace 2017-03-09 19:16:42 +01:00
ArthurHoaro 9c5daad19c Merge pull request #792 from ArthurHoaro/feature/private-filter-visual 
Display private only filter as search criteria
 2017-03-09 19:15:47 +01:00
ArthurHoaro 1e38df6606 Merge pull request #791 from ArthurHoaro/feature/ctrl-enter-submit 
Submit editlink textarea using CTRL+Enter shortcut
 2017-03-09 19:14:10 +01:00
VirtualTam 2008098574 Merge pull request #796 from virtualtam/changelog 
Add v0.7.1 to CHANGELOG.md
 2017-03-08 23:07:53 +01:00
VirtualTam 5b750090c7 Add v0.7.1 to CHANGELOG.md 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2017-03-08 22:58:44 +01:00
ArthurHoaro e6cd773f5a Fix blocking namespace issue 2017-03-08 20:00:21 +01:00
ArthurHoaro 7c26f6626a Display private only filter as search parameter 2017-03-08 19:57:15 +01:00
ArthurHoaro 2dd698fd79 Submit editlink textarea using CTRL+Enter shortcut 2017-03-08 18:59:54 +01:00
ArthurHoaro db0caba3c4 Merge pull request #790 from ArthurHoaro/feature/intl-dates 
Fix autoLocale error and cover it with unit tests
 2017-03-07 19:32:36 +01:00
ArthurHoaro 03b9cb600a Fix autoLocale error and cover it with unit tests 2017-03-07 19:27:17 +01:00
ArthurHoaro 9971f7c82c Merge pull request #750 from ArthurHoaro/feature/intl-dates 
Improve datetime display
 2017-03-06 21:13:48 +01:00
ArthurHoaro 36c8fb1ef8 Use all_tests target in Travis CI 2017-03-06 21:11:18 +01:00
ArthurHoaro 6c7d686454 Run languages tests using PHPUnit test suites 2017-03-06 21:11:18 +01:00