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

933 commits

This branch
This branch
All branches
Author SHA1 Message Date
VirtualTam
ce8e248ab0 Merge pull request #306 from ArthurHoaro/fpd 
Avoid Full Path Disclosure error on session error.
 2015-08-24 21:25:33 +02:00
VirtualTam
b5d96e9b1f Merge pull request #327 from virtualtam/travis/php7 
travis: add PHP 7 to the tested environments
 2015-08-24 00:30:05 +02:00
ArthurHoaro
06b6660a7e Avoid Full Path Disclosure error on session error. 
* Add a function to validate session ID.
  * Generate a new session ID if an invalid token is passed.
 2015-08-22 10:10:55 +02:00
VirtualTam
bdf4f78519 travis: add PHP 7 to the tested environments 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-22 00:09:46 +02:00
VirtualTam
d7efade5d6 Bump version to 0.5.1 
Minor changes
 - fix 404 after editing a link while being logged out
 - update local documentation
 - improve timezone detection at installation
 - improve feed cache handling
 - improve URL cleanup for new links
 - add a link to the shaarli/shaarli DockerHub repository

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-18 00:36:55 +02:00
VirtualTam
6335a0fc0c Doc: sync from Wiki, generate HTML 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-18 00:33:25 +02:00
VirtualTam
f8bf8d8e59 Merge pull request #314 from shaarli/clean-utm_term 
clean utm_term url parameter
 2015-08-16 23:01:54 +02:00
VirtualTam
c622d32820 README: add DockerHub badge 
See [docker-shaarli](https://github.com/shaarli/docker-shaarli) for Dockerfiles and documentation
 2015-08-16 14:50:16 +02:00
VirtualTam
d9d776af19 Links: refactor & improve URL cleanup 
Relates to #141
Relates to #133

Modifications
 - move URL cleanup to `application/Url.php`
 - rework the cleanup function
   - fragments: `#stuff`
   - GET parameters: `?var1=val1&var2=val2`
 - add documentation (APIs the params belong to)
 - add test coverage

Reference
 - http://php.net/parse_url
 - http://php.net/manual/en/language.oop5.magic.php#language.oop5.magic.tostring

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-15 15:58:38 +02:00
VirtualTam
a3b1b4ae70 Merge pull request #309 from virtualtam/refactor/PageCache 
CachedPage: move to a proper file, add tests
 2015-08-13 23:54:26 +02:00
VirtualTam
aedd62e2b8 Cache: simplify cached content cleanup, improve tests 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-13 23:51:31 +02:00
VirtualTam
01e48f269d CachedPage: move to a proper file, add tests 
Modifications
 - rename `pageCache` to `CachedPage`
 - move utilities to `Cache`
 - do not access globals
 - apply coding rules
 - update LinkDB and test code
 - add test coverage

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-13 23:48:06 +02:00
VirtualTam
5ac5349ac0 Merge pull request #301 from ArthurHoaro/edit-link-redirect 
Fixes #299: prevent 404 on '?edit_link' while logged out
 2015-08-13 23:47:05 +02:00
ArthurHoaro
5fbabbb9be Fixes #299: prevent 404 on '?edit_link' while logged out 
- add a use case for edit_link in logged out part.
 - *really* prevent loops on login screen.
 2015-08-07 16:26:38 +02:00
VirtualTam
b282fffa23 Merge pull request #313 from virtualtam/install/timezone 
Installation: default to the server's timezone
 2015-08-05 16:34:40 +02:00
VirtualTam
afd7b77b4c Installation: default to the server's timezone 
Modifications
 - attempt to use the server's timezone
 - if none is set, use UTC
 - TimeZone: apply coding conventions
   - variable naming
   - no closing PHP tag

Relates to #274

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-04 23:54:03 +02:00
VirtualTam
27cf2e671d Merge pull request #294 from virtualtam/doc/update 
Doc: sync from Wiki, generate HTML
 2015-08-04 16:07:13 +02:00
VirtualTam
992af0b9d7 Doc: sync from Wiki, generate HTML 
Closes #291
Fixes #227

Modifications
 - HTML content: match the new Wiki structure
 - Makefile
   - generate a custom HTML sidebar
   - include the sidebar on all pages
   - infer and prepend page titles
   - handle relative links
   - add title metadata, e.g. Shaarli - <Page Name>

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-08-04 16:02:21 +02:00
VirtualTam
96db105e4c Merge pull request #276 from virtualtam/tools/phpcs 
Add a generic rule to run PHPCS against different coding standards
 2015-07-31 16:08:32 +02:00
VirtualTam
a421aeea66 Merge pull request #303 from virtualtam/v0.5.0 
Bump version to 0.5.0
 2015-07-30 11:43:43 +02:00
VirtualTam
7d4263e11a Bump version to 0.5.0 
Major changes
 - fix locale handling
 - fix note URLs
 - fix page redirections
 - fix daily RSS browsing
 - fix title display
 - fix links not being hidden when `HIDE_PUBLIC_LINKS` is set
 - restore compatibility with PHP 5.3
 - remove duplicate tags in links
 - remove annoying URL patterns
 - add Firefox Social API
 - Search/Filter by tag fieds can now be accessed quickly with the `Tab` key
 - update documentation
 - start code refactoring
   - move all settings to `data/config.php`
   - refactor Config, LinkDB, TimeZone, Utils
   - add unit test coverage
   - add Travis integration

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-30 11:20:51 +02:00
ArthurHoaro
462bfb1312 Add Requirements section in README (link to wiki). 
Fixes #297
 2015-07-24 11:13:04 +02:00
Arthur
f22a494a1e Merge pull request #295 from Knah-Tsaeb/patch-1 
[fix]  #293 - Black thumbnails on picture wall after upgrade
 2015-07-23 15:45:59 +02:00
VirtualTam
caaae9b32b Merge pull request #289 from virtualtam/make-clean 
Makefile: do not call `clean` before `test`
 2015-07-23 00:34:52 +02:00
Knah Tsaeb
bb2948c52a [fix] #293 
Black thumbnails on picture wall after upgrade #293
 2015-07-22 10:39:23 +02:00
VirtualTam
d0ce99e59e Makefile: do not call clean before test 
Fixes #288

Modifications:
 - call `make clean` explicitely to clean the workspace
 - add `make clean` to Travis instructions

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-18 13:43:19 +02:00
VirtualTam
2ac5938b67 Merge pull request #290 from virtualtam/travis-container 
Travis: use the container-based infrastructure
 2015-07-18 13:42:15 +02:00
VirtualTam
39d06fa545 Travis: use the container-based infrastructure 
See http://docs.travis-ci.com/user/migrating-from-legacy/

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-18 13:23:00 +02:00
Arthur
874f858b8f Merge pull request #271 from virtualtam/php53 
PHP: ensure 5.3 compatibility
 2015-07-15 11:05:07 +02:00
VirtualTam
d1e2f8e52c PHP: ensure 5.3 compatibility, refactor timezone utilities 
Relates to #250

Modifications
 - supported version
   - bump required version from 5.1.0 to 5.3.x
   - update README
   - add PHP 5.3 to Travis environments
 - rewrite array declarations: explicitely use array() instead of []
 - move checkPHPVersion to application/Utils.php
 - move timezone functions to application/TimeZone.php
   - cleanup code
   - improve test coverage

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-13 13:06:06 +02:00
VirtualTam
3e25f245f9 Makefile: add a generic rule to run PHPCS against different coding standards 
Relates to #95

Usage
 - list available standards
   $ ./vendor/bin/phpcs -i
 - run PHPCS against a given standard
   $ make PHPCS_<standard>

Examples
 $ make PHPCS_PSR1
 $ make PHPCS_Zend

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-12 23:04:43 +02:00
VirtualTam
5b0ebbc5de Merge pull request #257 from ArthurHoaro/tag-http-referer 
Prevent redirection loop everytime we rely on HTTP_REFERER
 2015-07-12 19:56:13 +02:00
ArthurHoaro
775803a05c Prevent redirection loop everytime we rely on HTTP_REFERER: 
* search tag
  * delete tag
  * pagination
  * display privates only
  * delete link
  * new/edit/cancel link return page

Move location generation to Utils.php + unit tests.

Fixes #256

ninja
 2015-07-12 17:43:13 +02:00
Arthur
1dcbe29611 English mistake cf sebsauvage/Shaarli#221 2015-07-12 15:16:37 +02:00
ArthurHoaro
6ac95d9cf1 Fixes warning 'Undefined index: searchtags' while filtering by tags. 
Happened if there were not any searchtags already present in the query.
 2015-07-12 11:36:42 +02:00
Arthur
7bd3542b1b Merge pull request #262 from ArthurHoaro/dup-tags 
Avoid tag duplicates
 2015-07-12 11:01:24 +02:00
ArthurHoaro
781e8aadea Avoid tag duplicates 
* Prevent duplicate client side with awesomplete
 * Prevent duplicate server side (save_edit processing)

Fixes #261
 2015-07-12 10:34:29 +02:00
VirtualTam
bba021defc Merge pull request #268 from ArthurHoaro/dailrss-template 
Include the whole <item> in Daily RSS template
 2015-07-11 19:09:52 +02:00
VirtualTam
1b73f35ebf Merge pull request #269 from virtualtam/fix/read-config 
Fix: data/config.php was not imported
 2015-07-11 12:48:24 +02:00
ArthurHoaro
f3b8f9f0f8 Include the whole <item> in dailyRSS 
Allow custom date format and title in templates.

Also a bit of code style review.

Fixes #182
 2015-07-11 10:25:25 +02:00
VirtualTam
50c9a12ee6 Fix: data/config.php was not imported 
Relates to #255

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-11 00:12:13 +02:00
VirtualTam
49ca756950 Merge pull request #267 from virtualtam/linkdb/private-names 
LinkDB: prefix private members with an underscore
 2015-07-10 17:43:00 +02:00
VirtualTam
07b6fa750b LinkDB: prefix private members with an underscore 
Relates to #95, #218

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-09 21:46:01 +02:00
VirtualTam
e92f1ba59e Merge pull request #255 from ArthurHoaro/config 
All settings are now stored in config.php
 2015-07-09 21:34:46 +02:00
ArthurHoaro
dd484b90b1 All settings are now stored in config.php 
Isolate functions related to config in Config.php + add unit tests + code_sniffer.

options.php is not supported anymore, but its content will be automatically saved into config.php

Fixes #shaarli/Shaarli#41

*TODO*: update [documentation](https://github.com/shaarli/Shaarli/wiki#configuration).
 2015-07-09 20:46:03 +02:00
VirtualTam
7f1dfd1c12 Merge pull request #251 from virtualtam/linkdb/date-format 
LinkDB::filterDay(): check input date format
 2015-07-09 01:00:40 +02:00
VirtualTam
9186ab9594 LinkDB::filterDay(): check input date format 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
 2015-07-09 00:44:19 +02:00
VirtualTam
46d83c20d7 Merge pull request #264 from ArthurHoaro/daily-nav 
Fixes #260: previous/next day links in daily
 2015-07-09 00:16:07 +02:00
ArthurHoaro
f3db3774f9 Fixes #260: previous/next day links in daily 
The bug was occuring only if we tried to access to the first day.
 2015-07-08 17:12:06 +02:00
nodiscc
eee711c0a8 Merge pull request #254 from virtualtam/test/linkdb/datastore 
LinkDBTest: only check that the datastore is created and non-empty
 2015-06-28 15:53:27 +02:00