aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflictMario Vavti2016-07-182-1/+3
|\
| * do not transform hashes to tags in [code=xxx] or [code] blocksMario Vavti2016-07-181-1/+1
| * update changelogredmatrix2016-07-171-0/+41
| * jquery update issue prevents comments from reloading and resetting watch cursorredmatrix2016-07-171-1/+1
| * change std_versionredmatrix2016-07-171-1/+1
* | roll versionredmatrix2016-07-171-1/+1
* | update changelogredmatrix2016-07-171-0/+41
* | jquery update issue prevents comments from reloading and resetting watch cursorredmatrix2016-07-171-1/+1
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-172-1/+3
|\
| * hide fullscreen button in embedphotos modal album viewMario Vavti2016-07-172-1/+3
* | include attach.php at the module level since 2d4b75428a87038 wasn't backporte...redmatrix2016-07-173-1/+4
|/
* boobooredmatrix2016-07-171-2/+2
* some work on guest access token uiMario Vavti2016-07-173-37/+45
* check for variables after schema files have been addedMario Vavti2016-07-161-12/+12
* check for variables in schemesMario Vavti2016-07-161-1/+1
* hide/show mixupMario Vavti2016-07-161-3/+2
* only use visibility for tabsMario Vavti2016-07-161-4/+4
* os_delete_prohibitredmatrix2016-07-161-0/+4
* add new service class restriction to the docoredmatrix2016-07-151-0/+1
* add service class restrictions to access_tokensredmatrix2016-07-152-1/+11
* remove expired access tokensredmatrix2016-07-151-0/+9
* provide examples for using access tokens in urlsredmatrix2016-07-154-2/+20
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeredmatrix2016-07-1512-541/+35
|\
| * bump minor version because of jquery updateMario Vavti2016-07-152-10/+3
| * round up heightMario Vavti2016-07-151-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2016-07-155-1818/+1888
| |\
| * | add jquery migrate for version 3Mario Vavti2016-07-151-0/+2
| * | upgrade to jquery-3.1 and minor fixesMario Vavti2016-07-1510-531/+30
* | | login isn't always your email.redmatrix2016-07-151-1/+1
* | | mod_home: if using an atoken login on the home page redirect to the channel p...redmatrix2016-07-151-0/+13
| |/ |/|
* | make lockview work with throwaway identitiesredmatrix2016-07-151-2/+33
* | more cleanup of atoken UIredmatrix2016-07-153-2/+9
* | cleanup and debug of atoken featureredmatrix2016-07-153-4/+12
* | enforce non-empty name and token/password on access tokens until better check...redmatrix2016-07-152-1812/+1836
|/
* Here's the basic UI for the Zot Access Tokens, requires some minor cleanupredmatrix2016-07-143-1/+114
* make the xchan_hash for the access token location independentredmatrix2016-07-142-16/+21
* missing braceredmatrix2016-07-141-1/+1
* schema updates for zot access tokensredmatrix2016-07-144-2/+77
* add zat to aclredmatrix2016-07-141-1/+26
* more ZAT workredmatrix2016-07-144-3/+37
* first cut at zot access tokensredmatrix2016-07-142-24/+85
* markdown is whitespace sensitiveredmatrix2016-07-141-1/+1
* who are weredmatrix2016-07-141-0/+12
* let abconfig specify a familyredmatrix2016-07-132-4/+6
* document mod_acl a bit better and try to remove some redundancies and consoli...redmatrix2016-07-134-28/+62
* missing namespace prefix \redmatrix2016-07-121-1/+1
* update_remote_id - updated to work with iconfigredmatrix2016-07-121-18/+5
* don't try to send sync packets to dead sites.redmatrix2016-07-121-1/+6
* the abconfig defaults weren't changed in the schema files when they were chan...redmatrix2016-07-122-2/+2
* move permissiondescription class to zotlabs/libredmatrix2016-07-1111-26/+12