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

1731 commits

This branch
This branch
All branches
Author SHA1 Message Date
ArthurHoaro
c8cb5c2824 Merge pull request #844 from ArthurHoaro/hotfix/id-0 
Fix offset check with link ID = 0
 2017-04-05 19:38:25 +02:00
ArthurHoaro
bc5f1597eb Fix offset check with link ID = 0 2017-04-05 19:09:25 +02:00
ArthurHoaro
49bc541d79 Apply the new timezone template variables to the vintage theme 2017-04-04 18:44:24 +02:00
ArthurHoaro
a07373135e Apply the new timezone template variables to the default theme 2017-04-04 18:44:20 +02:00
ArthurHoaro
ae3aa96898 Change timezone data structure send to the templates 
The goal of this is to be able to adapt the timezone form
in template without hacking the HTML already rendered.

  * there are two arrays available:
    * `continents` which contains only a list of available continents
    * `cities` which contains a list of available timezone cities, associated with their continent

Note: there are two distinct array because RainTPL doesn't support nested loop very well.
 2017-04-03 19:24:55 +02:00
ArthurHoaro
2109bb9d9a Merge pull request #800 from ArthurHoaro/hotfix/get-bytes-warning 
Fix a warning generated in return_bytes function and refactor it
 2017-04-03 19:02:33 +02:00
ArthurHoaro
b68134ac1d UtilsTest: PHP 5.5 compatibility 2017-04-03 18:53:43 +02:00
ArthurHoaro
84315a3bad Fix a warning generated in return_bytes function and refactor it 
It was multiplying a string containing a letter.

Moved function to Utils.php and display a human readable limit size
 2017-04-03 18:53:43 +02:00
ArthurHoaro
d9d49b687a Merge pull request #842 from ArthurHoaro/cleanup/remove-riy-plugin 
Remove readityourself plugin
 2017-04-03 18:41:02 +02:00
ArthurHoaro
8e33d0e767 Remove readityourself plugin 
Fixes #818
 2017-04-01 12:32:43 +02:00
ArthurHoaro
4b385d6c34 Merge pull request #742 from ArthurHoaro/api/postLink 
REST API: implement POST link service
 2017-04-01 10:02:03 +02:00
ArthurHoaro
e96be632f5 Merge pull request #839 from ArthurHoaro/theme/daily-page-title 
Display daily date in the page title (browser title)
 2017-03-29 18:38:52 +02:00
ArthurHoaro
f9c179ce07 Merge pull request #838 from ArthurHoaro/theme/daily-date-format 
Theme: use format_date function for daily date
 2017-03-29 18:38:40 +02:00
ArthurHoaro
935222b8b2 Display daily date in the page title (browser title) 
Fixes #211
Depends on #838
 2017-03-28 20:51:11 +02:00
ArthurHoaro
81bd104daa Theme: use format_date function for daily date 2017-03-28 20:43:30 +02:00
ArthurHoaro
b64d83cd2b Merge pull request #837 from ArthurHoaro/theme/js-edit-linklist-margin 
Theme: JS - Fix a bug preventing edit margin suppression to work
 2017-03-27 19:23:54 +02:00
ArthurHoaro
0040058da6 Theme: JS - Fix a bug preventing edit margin suppression to work 
Explanation: an ID with a leading digit isn't a valid CSS selector
 2017-03-27 19:17:49 +02:00
ArthurHoaro
68016e3798 REST API: implement POST link service 2017-03-27 18:44:50 +02:00
ArthurHoaro
b320c860f5 Merge pull request #832 from ArthurHoaro/theme/font 
Theme: change global font to Roboto and include bold variant
 2017-03-27 18:35:33 +02:00
ArthurHoaro
06cb3300f3 Merge pull request #834 from philipp-r/issue-833 
Tags parameter for redirects
 2017-03-25 20:54:48 +01:00
philipp-r
0b04f7970c Tags parameter for redirects #833 2017-03-25 19:41:01 +01:00
ArthurHoaro
ad5c757066 Theme: change global font to Roboto and include bold variant 
Fixes #822
 2017-03-24 18:49:45 +01:00
ArthurHoaro
bae74cb292 Merge pull request #831 from ArthurHoaro/theme/install-api-enable 
Add API setting in the new theme during the installation
 2017-03-23 18:32:26 +01:00
ArthurHoaro
4296080c8e Merge pull request #829 from ArthurHoaro/hotfix/id-0 
Fixes a bug preventing to edit link with ID 0
 2017-03-23 18:31:40 +01:00
ArthurHoaro
76be95e199 Add API setting in the new theme during the installation 
Also use the same variable name across template files
 2017-03-22 19:58:22 +01:00
ArthurHoaro
b712ab0ac4 Fixes a bug preventing to edit link with ID 0 
Fixes #814
 2017-03-22 19:08:17 +01:00
ArthurHoaro
c843794786 Merge pull request #828 from ArthurHoaro/project/master-version 
Fix version check branch for UT
 2017-03-22 18:59:40 +01:00
ArthurHoaro
5e4a83bb98 Fix version check branch for UT 2017-03-22 18:55:09 +01:00
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
d16ca2e22f History: lazy loading for the history file 
Only read it when it's necessary
 2017-03-21 20:29:20 +01:00
ArthurHoaro
4306b184c4 History mechanism 
Use case: rest API service

  * saved by default in data/history
  * same format as datastore.php
  * traced events:
     * save/edit/delete link
     * change settings or plugins settings
     * rename tag
 2017-03-21 20:29:20 +01:00
ArthurHoaro
b2306b0c78 Move database read/write to FileUtils class + additional unit tests 2017-03-21 20:16:26 +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