]> CyberLeo.Net >> Repos - Github/YOURLS.git/log
Github/YOURLS.git
8 years agoRe-enable actions only if edit-save succeeded
BestNa.me Labs [Tue, 22 Mar 2016 19:09:38 +0000 (20:09 +0100)]
Re-enable actions only if edit-save succeeded

Fixes a flaw in `edit_link_save()` in insert.js:

On exit, `edit_link_save()` re-enables all buttons of the action column, regardless of the value of `status` as returned by the ajax call (`action=edit_save`), i.e. also if the `status` is `fail` which means that the edit row remains visible. Because of that, it is then possible to open another edit row for the same keyword/long URL row. It is even possible to repeat this, introducing an arbitrary number of open edit rows with the same content.

8 years agoMerge pull request #2065 from BstName/fix
ozh [Mon, 21 Mar 2016 20:44:27 +0000 (21:44 +0100)]
Merge pull request #2065 from BstName/fix

Re-enable cancel on exiting edit_link_save()

8 years agoRe-enable cancel on exiting edit_link_save()
BestNa.me Labs [Mon, 21 Mar 2016 20:00:04 +0000 (21:00 +0100)]
Re-enable cancel on exiting edit_link_save()

Fixes a flaw in `edit_link_save()` in insert.js:

On exit, `edit_link_save()` correctly ends the loading state of the cancel button (i.e. the element with id `edit-close-y...`), but leaves the element disabled. This gets evident if and only if the ajax call (`action=edit_save`) returns with a `status` of `fail`, since only then the edit row with the disabled cancel button will not be faded out.

8 years agoMerge pull request #2060 from RobiNN1/patch-1
ozh [Wed, 16 Mar 2016 20:19:22 +0000 (21:19 +0100)]
Merge pull request #2060 from RobiNN1/patch-1

Bug fix: incorrect value unset when translation file loaded

8 years agoUpdate yourls-infos.php
RobiNN1 [Wed, 16 Mar 2016 19:06:30 +0000 (19:06 +0000)]
Update yourls-infos.php

Bug Fix

8 years agoMerge pull request #2059 from matecode/patch-1
ozh [Wed, 16 Mar 2016 17:17:20 +0000 (18:17 +0100)]
Merge pull request #2059 from matecode/patch-1

Update readme.html

8 years agoUpdate readme.html
Mate [Wed, 16 Mar 2016 15:15:33 +0000 (16:15 +0100)]
Update readme.html

added aYourls to Android apps

8 years agoMerge pull request #2055 from BstName/bug-fix
ozh [Sun, 13 Mar 2016 15:24:22 +0000 (16:24 +0100)]
Merge pull request #2055 from BstName/bug-fix

Updating total clicks on delete

8 years agoReworking decrease_total_clicks( id )
BestNa.me Labs [Sat, 12 Mar 2016 07:51:23 +0000 (08:51 +0100)]
Reworking decrease_total_clicks( id )

8 years ago#total_clicks -> #overall_tracking in surrnd. <p>
BestNa.me Labs [Sat, 12 Mar 2016 07:48:06 +0000 (08:48 +0100)]
#total_clicks -> #overall_tracking in surrnd. <p>

8 years agoAdded `decrease_total_clicks( id )` + call
BestNa.me Labs [Thu, 10 Mar 2016 20:58:58 +0000 (21:58 +0100)]
Added `decrease_total_clicks( id )` + call

Added a function `decrease_total_clicks( id )` in js/insert.js which decreases the element containing the number of total clicks on the admin page by the value contained in the element `$('#clicks-' + id)` (i.e. by the value picked from the 'Clicks' column of the respective deleted row). Now called this method at the appropriate place in function `remove_link(id)`, thereby passing on `id` as parameter.

8 years agoAdditional id for tag containing $total_clicks
BestNa.me Labs [Thu, 10 Mar 2016 20:51:57 +0000 (21:51 +0100)]
Additional id for tag containing $total_clicks

Granted the `<strong>` tag containing the number of total clicks its own id (in admin/index.php) (the element should be prominent enough to deserve it).

8 years agoMerge pull request #2054 from BstName/bug-fix
Léo Colombaro [Wed, 9 Mar 2016 23:00:49 +0000 (00:00 +0100)]
Merge pull request #2054 from BstName/bug-fix

Go to First Page -> Go to Last Page

8 years agoGo to First Page -> Go to Last Page
BestNa.me Labs [Wed, 9 Mar 2016 21:24:48 +0000 (22:24 +0100)]
Go to First Page -> Go to Last Page

Fixes a minor glitch in yourls_html_tfooter() in functions-html.php:

In the pagination section of the URL table, the 'Go to Last Page'-link has a `title` attribute 'Go to First Page' (one can notice that by hovering it). Should of course be titled 'Go to Last Page'.

8 years agoMerge branch 'refs/heads/pr/1921'
Léo Colombaro [Sat, 5 Mar 2016 18:15:40 +0000 (19:15 +0100)]
Merge branch 'refs/heads/pr/1921'

* refs/heads/pr/1921:
  Merge duplicate HTML elements
  add ARIA landmark

8 years agoMerge duplicate HTML elements
Léo Colombaro [Sat, 5 Mar 2016 18:14:40 +0000 (19:14 +0100)]
Merge duplicate HTML elements

8 years agoMerge pull request #2051 from BstName/html-fix
Léo Colombaro [Sat, 5 Mar 2016 18:02:05 +0000 (19:02 +0100)]
Merge pull request #2051 from BstName/html-fix

Fixing markup and comment

8 years agoFixing markup and comment
BestNa.me Labs [Sat, 5 Mar 2016 17:42:11 +0000 (18:42 +0100)]
Fixing markup and comment

Minor fixes in yourls-infos.php:
1. Removes an unclosed and superfluous <strong> tag in the line reading e.g.  '43 hits on January 1, 1970'. This caused wrong HTML and therefore most browsers rendered *all* dates in the list appearing on click of 'Click for more details' with bold font-weight (i.e., not only those of the best year / month / day as intended).
2. Took the liberty of also changing a closing comment token from '/**/' to the more common '**/' (in the comment titled 'I can haz debug data'). While this was perfectly valid code, it confused the syntax highlighter of github (all past the '/**/' appeared in a frightening red).

8 years agoTemp fix for http_build_url, see #2050
Léo Colombaro [Fri, 4 Mar 2016 23:23:01 +0000 (00:23 +0100)]
Temp fix for http_build_url, see #2050

8 years agoMerge pull request #2049 from BstName/+all-fix
Léo Colombaro [Fri, 4 Mar 2016 21:30:06 +0000 (22:30 +0100)]
Merge pull request #2049 from BstName/+all-fix

Fix f. missing chart bar add (+all) icon

8 years agoFix f. missing chart bar add (+all) icon
BestNa.me Labs [Fri, 4 Mar 2016 21:01:56 +0000 (22:01 +0100)]
Fix f. missing chart bar add (+all) icon

Fixes the following bug:

When allowing for multiple short URLs for a same long URL (bitly behavior [behaviour]), the chart bar adding symbol linking to YOURLS_SITE/keyword+all does not show up on infos pages.

8 years agoMerge pull request #2048 from gmolop/patch-1
ozh [Fri, 4 Mar 2016 18:24:41 +0000 (19:24 +0100)]
Merge pull request #2048 from gmolop/patch-1

Support for timezone offset in stats graph

8 years agoMerge branch 'master' of https://github.com/YOURLS/YOURLS
ozh [Fri, 4 Mar 2016 14:41:18 +0000 (15:41 +0100)]
Merge branch 'master' of https://github.com/YOURLS/YOURLS

8 years agoMerge pull request #2044 from master3395/patch-1
ozh [Fri, 4 Mar 2016 13:56:19 +0000 (14:56 +0100)]
Merge pull request #2044 from master3395/patch-1

Adding HTTPs for tumblr link

8 years agoTime zone offset in Stats Graph
gmo [Fri, 4 Mar 2016 11:53:56 +0000 (12:53 +0100)]
Time zone offset in Stats Graph

Stats page graph updated to use time zone offset defined in config file (YOURLS_HOURS_OFFSET).

8 years agoAdding HTTPs for tumblr link
master3395 [Tue, 1 Mar 2016 21:46:50 +0000 (22:46 +0100)]
Adding HTTPs for tumblr link

Adding HTTPs for tumblr link

8 years agoUpdate from original
BstName [Mon, 29 Feb 2016 21:19:19 +0000 (22:19 +0100)]
Update from original

8 years agoCreate ISSUE_TEMPLATE.md
Léo Colombaro [Wed, 17 Feb 2016 20:07:33 +0000 (21:07 +0100)]
Create ISSUE_TEMPLATE.md

https://github.com/blog/2111-issue-and-pull-request-templates

8 years agoSync with http_build_url
ozh [Sun, 10 Jan 2016 11:59:04 +0000 (12:59 +0100)]
Sync with http_build_url

8 years agoLoad custom textdomain only if locale set
ozh [Mon, 28 Dec 2015 10:58:48 +0000 (11:58 +0100)]
Load custom textdomain only if locale set

Fixes #2009

8 years agoPrepare potential next bugfix release
ozh [Mon, 28 Dec 2015 10:58:02 +0000 (11:58 +0100)]
Prepare potential next bugfix release

Next dot release stuff should get committed in their own branch

8 years agoAdded Sleeky in the showcase
ozh [Tue, 22 Dec 2015 17:13:48 +0000 (18:13 +0100)]
Added Sleeky in the showcase

8 years agoFetch 32K instead of 2K to find a <title>
ozh [Fri, 18 Dec 2015 21:04:30 +0000 (22:04 +0100)]
Fetch 32K instead of 2K to find a <title>

Fixes #2005

8 years agoTypo 1.7.1
ozh [Sat, 5 Dec 2015 20:59:49 +0000 (21:59 +0100)]
Typo

8 years agoMerge pull request #1998 from YOURLS/pr1824
ozh [Sat, 5 Dec 2015 11:51:33 +0000 (12:51 +0100)]
Merge pull request #1998 from YOURLS/pr1824

Dont fetch all page to get title. Fixes #1824

8 years agoNew Requests files
ozh [Sat, 5 Dec 2015 10:55:40 +0000 (11:55 +0100)]
New Requests files

8 years agoMerge branch 'master' into pr1824
ozh [Sat, 5 Dec 2015 10:54:03 +0000 (11:54 +0100)]
Merge branch 'master' into pr1824

8 years agoFilter to allow shunting external requests
ozh [Sat, 5 Dec 2015 10:33:55 +0000 (11:33 +0100)]
Filter to allow shunting external requests

8 years agoMerge pull request #1997 from YOURLS/php7
ozh [Fri, 4 Dec 2015 18:38:19 +0000 (19:38 +0100)]
Merge pull request #1997 from YOURLS/php7

PHP7 compatibility

8 years agoCall your parents, kid
ozh [Fri, 4 Dec 2015 18:34:28 +0000 (19:34 +0100)]
Call your parents, kid

8 years agoDamnit I didn't press 'Save' before pushing
ozh [Fri, 4 Dec 2015 18:27:22 +0000 (19:27 +0100)]
Damnit I didn't press 'Save' before pushing

8 years agoMore PHP7 fixes
ozh [Fri, 4 Dec 2015 18:24:54 +0000 (19:24 +0100)]
More PHP7 fixes

8 years agoCheck with PHP7
ozh [Fri, 4 Dec 2015 18:18:19 +0000 (19:18 +0100)]
Check with PHP7

8 years agoGoodbye FriendFeed !
ozh [Fri, 4 Dec 2015 17:09:04 +0000 (18:09 +0100)]
Goodbye FriendFeed !

Fixes #1986

8 years agoMerge branch 'master' of https://github.com/YOURLS/YOURLS
ozh [Fri, 4 Dec 2015 16:51:28 +0000 (17:51 +0100)]
Merge branch 'master' of https://github.com/YOURLS/YOURLS

8 years agoMerge pull request #1988 from berndblume/master
ozh [Fri, 4 Dec 2015 16:50:36 +0000 (17:50 +0100)]
Merge pull request #1988 from berndblume/master

Fix password auto encryption with slash(es)

Fixes #1994
Fixes #1987
Thanks @berndblume !

8 years agoSync Requests
ozh [Sat, 28 Nov 2015 17:23:11 +0000 (18:23 +0100)]
Sync Requests
Latest OK build on master: https://github.com/rmccue/Requests/tree/6f69bd206bfa4f00a1ec355ab7226ee64ac988dd

8 years agoDont download whole page when fetching title
ozh [Sat, 28 Nov 2015 16:47:08 +0000 (17:47 +0100)]
Dont download whole page when fetching title
Fixes 1824

8 years agofixed preg_quote to make password auto encryption work even when password contains...
Bernd Blume [Fri, 27 Nov 2015 01:35:50 +0000 (17:35 -0800)]
fixed preg_quote to make password auto encryption work even when password contains forward slashes

8 years agoSync with current version of Requests
ozh [Sun, 4 Oct 2015 15:38:20 +0000 (17:38 +0200)]
Sync with current version of Requests

Specifically, we're interested in the byte limit response feature

8 years agoTrim URL before sanitizing. Fixes #1931
ozh [Tue, 28 Jul 2015 10:42:59 +0000 (12:42 +0200)]
Trim URL before sanitizing. Fixes #1931

8 years agoadd ARIA landmark
Audrey [Fri, 26 Jun 2015 10:18:15 +0000 (12:18 +0200)]
add ARIA landmark

8 years agoFix oops from previous fix. Fixes #1915.
ozh [Fri, 5 Jun 2015 14:04:07 +0000 (16:04 +0200)]
Fix oops from previous fix. Fixes #1915.

For real!

8 years agoFix mb_ fallbacks and PCRE/u compat check
ozh [Fri, 5 Jun 2015 14:01:51 +0000 (16:01 +0200)]
Fix mb_ fallbacks and PCRE/u compat check

Fixes 1915

8 years agoProper docblock
ozh [Mon, 1 Jun 2015 20:45:08 +0000 (22:45 +0200)]
Proper docblock

[skip ci]

8 years agoAccept '02' and 2, as advertised in docblock
ozh [Sun, 31 May 2015 12:49:13 +0000 (14:49 +0200)]
Accept '02' and 2, as advertised in docblock

8 years agoRefine comments, rename function
ozh [Fri, 29 May 2015 21:12:27 +0000 (23:12 +0200)]
Refine comments, rename function

[skip ci]

8 years agoRefactor functions sending headers to be testable
ozh [Wed, 27 May 2015 15:40:45 +0000 (17:40 +0200)]
Refactor functions sending headers to be testable

By the way, not sure why one is in functions.php and the other one in functions-html.php ...

8 years agoRefactor function to be testable
ozh [Wed, 27 May 2015 15:38:58 +0000 (17:38 +0200)]
Refactor function to be testable

8 years agoToday I Learnt: you can't check consts for empty
ozh [Mon, 25 May 2015 19:39:40 +0000 (21:39 +0200)]
Today I Learnt: you can't check consts for empty

Doesn't work at all, interestingly for different reasons across PHP versions - http://3v4l.org/06f2E

8 years agoOopsie.
ozh [Mon, 25 May 2015 19:25:34 +0000 (21:25 +0200)]
Oopsie.

8 years agoRefactor proxy functions
ozh [Mon, 25 May 2015 11:07:38 +0000 (13:07 +0200)]
Refactor proxy functions

Easier testing.

8 years agoAvoid notices during unit tests
ozh [Sat, 23 May 2015 21:46:45 +0000 (23:46 +0200)]
Avoid notices during unit tests

[skip ci]

8 years agoLess if(function_exists())
ozh [Fri, 22 May 2015 20:07:13 +0000 (22:07 +0200)]
Less if(function_exists())

Because
- it hinders unit tests
- it makes code less readable
- it's easier to have compat functions and eventually deprecate them when no longer needed

8 years agoAvoid notices during unit tests
ozh [Thu, 21 May 2015 21:15:55 +0000 (23:15 +0200)]
Avoid notices during unit tests

8 years agoRemove static var
ozh [Mon, 18 May 2015 19:42:24 +0000 (21:42 +0200)]
Remove static var

- this makes testing impossible once a value has been set
- this prevents the function to be actually shuntable after the value has been set

8 years agoyourls_get_protocol() can return '', not false
ozh [Fri, 15 May 2015 19:45:39 +0000 (21:45 +0200)]
yourls_get_protocol() can return '', not false

8 years agoBetter version string sanitizing
ozh [Fri, 15 May 2015 13:15:08 +0000 (15:15 +0200)]
Better version string sanitizing

8 years agoCode coverage syntax nitpicking
ozh [Mon, 11 May 2015 18:03:43 +0000 (20:03 +0200)]
Code coverage syntax nitpicking

functions-plugins.php not at 99.10%, 221 lines out of 223, covered :)

8 years agoAdd yourls_remove_all_(filters|actions)
ozh [Mon, 11 May 2015 09:50:01 +0000 (11:50 +0200)]
Add yourls_remove_all_(filters|actions)

8 years agoGet die() ouf of yourls_plugin_admin_page()
ozh [Mon, 11 May 2015 08:28:17 +0000 (10:28 +0200)]
Get die() ouf of yourls_plugin_admin_page()

This will make testing this function a lot easier, and it makes more sense to die after the function call, not within it.

[skip ci]

8 years agoImprove global declarations
ozh [Mon, 11 May 2015 07:42:01 +0000 (09:42 +0200)]
Improve global declarations

8 years agoAllow interception of yourls_die()
ozh [Mon, 11 May 2015 07:16:53 +0000 (09:16 +0200)]
Allow interception of yourls_die()

[skip ci]

8 years agoMore filter on small yourls_is_stuff() funcs
ozh [Thu, 7 May 2015 20:00:32 +0000 (22:00 +0200)]
More filter on small yourls_is_stuff() funcs

This will allow easier testing of various cases

8 years agoDeprecate function
ozh [Thu, 7 May 2015 19:50:59 +0000 (21:50 +0200)]
Deprecate function

It's a leftover from the era when we were loading includes/ files conditionally

8 years agoSimpler syntax
ozh [Thu, 7 May 2015 19:48:09 +0000 (21:48 +0200)]
Simpler syntax

8 years agoRemove unnecessary function_exists()
ozh [Wed, 6 May 2015 20:07:26 +0000 (22:07 +0200)]
Remove unnecessary function_exists()

spl_object_hash() is PHP 5.2+

8 years agoFilter helper functions
ozh [Sun, 3 May 2015 10:37:13 +0000 (12:37 +0200)]
Filter helper functions

return true, false, null, zero, '', []

9 years agoAllow brackets in URLs. Fixes #1814
ozh [Wed, 29 Apr 2015 14:51:35 +0000 (16:51 +0200)]
Allow brackets in URLs. Fixes #1814

I can't think of a good reason not to.

9 years agoMerge pull request #1894 from YOURLS/atlowercase
྅༻ Ǭɀħ ༄༆ཉ [Wed, 29 Apr 2015 14:34:34 +0000 (16:34 +0200)]
Merge pull request #1894 from YOURLS/atlowercase

Improve lowercasing of scheme & domain

Fixes #1890

9 years agoCorrect @since, duh
ozh [Wed, 29 Apr 2015 14:25:09 +0000 (16:25 +0200)]
Correct @since, duh

9 years agoImprove lowercasing of scheme & domain
ozh [Wed, 29 Apr 2015 14:20:56 +0000 (16:20 +0200)]
Improve lowercasing of scheme & domain

Fixes #1890

9 years agoRemove unnecessary compat functions
ozh [Sun, 26 Apr 2015 17:13:26 +0000 (19:13 +0200)]
Remove unnecessary compat functions

I mean, dude. PHP 4. Please.

9 years agoAvoid notice when not set
ozh [Sat, 25 Apr 2015 09:47:05 +0000 (11:47 +0200)]
Avoid notice when not set

In case a custom DB layer has rewritten the SQL query for instance

9 years agoAllow custom table creation on install
ozh [Thu, 23 Apr 2015 21:44:20 +0000 (23:44 +0200)]
Allow custom table creation on install

This allows for instance an SQLite driver which requires slightly modified tables

9 years agoMake sure we can bypass newer version check
ozh [Thu, 23 Apr 2015 21:38:27 +0000 (23:38 +0200)]
Make sure we can bypass newer version check

9 years agoFor hackers: add comment about preventing XSS
ozh [Mon, 20 Apr 2015 17:50:06 +0000 (19:50 +0200)]
For hackers: add comment about preventing XSS

9 years agoUse same timestamp in redirect than in new link
ozh [Thu, 16 Apr 2015 18:04:04 +0000 (20:04 +0200)]
Use same timestamp in redirect than in new link

Ozh,

I found a problem in Yourls.  It's not necessarily a problem with the code, but a problem none the less.

In functions.php, the timestamp is being written to the yourls_log and yourls_url db's differently, and depending on how the server is set up, it can cause a problem.

function yourls_log_redirect() writes the time with MySQL's NOW() keyword, while function yourls_insert_link_in_db() writes it with PHP's date('Y-m-d H:i:s').  On the webhost that I'm using, MySQL is using the server's time, not UTC, so it's 4 hours different than PHP's time, since PHP is being set with date_default_timezone_set( 'UTC' );

This drove me nuts for quite awhile until I realized what was going on.  Once I switched from NOW() to date('Y-m-d H:i:s') the problem went away and all my times are now the same. I believe both functions should use the same system for time so as to avoid this scenario.

BTW, great script!  I know I probably shouldn't ask ;) but... any idea when the next version will be released?  I read something about version 2.0 awhile back, but haven't heard anything since.

Thanks,
Frank

9 years agoWording. Fixes #1846
ozh [Thu, 16 Apr 2015 17:42:01 +0000 (19:42 +0200)]
Wording. Fixes #1846

9 years agoMerge pull request #1882 from YOURLS/noobsite
྅༻ Ǭɀħ ༄༆ཉ [Thu, 16 Apr 2015 14:09:16 +0000 (16:09 +0200)]
Merge pull request #1882 from YOURLS/noobsite

Smarter domain convention in examples and source

9 years agoSmarter domain convention in examples and source
ozh [Fri, 10 Apr 2015 20:46:06 +0000 (22:46 +0200)]
Smarter domain convention in examples and source

In config, readmes, editable files: the generic YOURLS install will be http://your-own-domain-here.com/ so that noob users get an obvious warning when they misconfigure something

In source comments, presumably read by hackers who have a clue, the generic YOURLS install will be http://sho.rt/. The generic long URL can be http://example.com/something-whatever

Closes #1841

9 years ago Prevent installation with default username/password.
྅༻ Ǭɀħ ༄༆ཉ [Thu, 12 Mar 2015 20:45:30 +0000 (21:45 +0100)]
 Prevent installation with default username/password.

Fixes #1864

9 years agoMerge pull request #1 from YOURLS/master
BestNa.me Labs [Tue, 10 Mar 2015 18:43:46 +0000 (19:43 +0100)]
Merge pull request #1 from YOURLS/master

Update from original

9 years agoMerge pull request #1862 from BstName/bugfix
Léo Colombaro [Tue, 10 Mar 2015 18:13:40 +0000 (19:13 +0100)]
Merge pull request #1862 from BstName/bugfix

Correction in yourls_die(): 'html_head' should be 'html_footer'

9 years agoCorrection in yourls_die(): 'html_head' should be 'html_footer'
BestNa.me Labs [Sun, 8 Mar 2015 18:38:59 +0000 (19:38 +0100)]
Correction in yourls_die(): 'html_head' should be 'html_footer'

Now checking for html_footer action before the call to yourls_html_footer() (code was checking for html_head action instead, which is wrong).

9 years agoMerge pull request #1854 from fredl99/patch-1
྅༻ Ǭɀħ ༄༆ཉ [Sat, 28 Feb 2015 23:57:01 +0000 (00:57 +0100)]
Merge pull request #1854 from fredl99/patch-1

Update functions-l10n.php

9 years agoUpdate functions-l10n.php
Fredl [Sat, 28 Feb 2015 16:33:21 +0000 (17:33 +0100)]
Update functions-l10n.php

´yourls_load_custom_textdomain´ can't read *.po files when ´$path´ is an absolute path on the server and the leading slash is removed. (´trim´ removes on both ends)

9 years agoAdd tini.link in the showcase
ozh [Mon, 15 Dec 2014 06:54:07 +0000 (07:54 +0100)]
Add tini.link in the showcase

9 years agoIgnore my tests files :-P :poop:
ozh [Fri, 5 Dec 2014 15:46:56 +0000 (16:46 +0100)]
Ignore my tests files :-P :poop:

9 years agoSync with recent Requests commits. Fixes #1796
ozh [Sun, 30 Nov 2014 10:49:25 +0000 (11:49 +0100)]
Sync with recent Requests commits. Fixes #1796