aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-202-3/+3
| | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | |_|_|_|/ | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | * | | | | Merge branch '1.10RC' into devMario Vavti2016-07-201-1/+1
| | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | | * | | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RCMario Vavti2016-07-202-0/+7
| | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | * \ \ \ Merge pull request #456 from anaqreon/1.10RC-updatesgit-marijus2016-07-202-0/+7
| | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | * | | | Wiki delete page confirmation and max image widthAndrew Manning2016-07-202-0/+7
| | | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | * | / / / type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ...Mario Vavti2016-07-201-1/+1
| | | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | | Merge pull request #455 from anaqreon/wikigit-marijus2016-07-202-0/+7
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ Merge remote-tracking branch 'upstream/dev' into wikiAndrew Manning2016-07-2070-2515/+2531
| | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | |_|/ / / / / | | | | | | | | | | | |/| | | | | |
| | | | | | | | | | | | * | | | | | Merge branch '1.10RC' into devMario Vavti2016-07-201-2/+2
| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | |/| | | |
| | | | | | | | | | | | * | | | | fix /mail wsod issue reported by giac hellvecioMario Vavti2016-07-201-2/+2
| | | | | | | | | | | | | |/ / / | | | | | | | | | | | | |/| | |
| | | | | | | | | | | | * | | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_mergeredmatrix2016-07-181-1/+1
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * | | | | runaway cron emailsredmatrix2016-07-181-10/+2
| | | | | | | | | | | | | | | | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-209-15/+52
| | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | |_|_|_|_|/ | | | | | | | | | | | |/| | | | |
| | | | | | | | | | | * | | | | | doc correctionredmatrix2016-07-191-1/+1
| | | | | | | | | | | * | | | | | issue #411redmatrix2016-07-191-0/+1
| | | | | | | | | | |/ / / / / /
| | | | | | | | | | * / / / / / runaway cron emailsredmatrix2016-07-181-10/+2
| | | | | | | | | |/ / / / / /
| | | | | | | | | * | | | | | whitespaceMario Vavti2016-07-181-2/+0
| | | | | | | | | * | | | | | 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
| | | | | | | | |\ \ \ \
| | | | | | | | * | | | | include attach.php at the module level since 2d4b75428a87038 wasn't backporte...redmatrix2016-07-173-1/+4
| | | | | | | | | | | | * Starting to make the import selection page after element scan.Andrew Manning2016-07-203-80/+176
| | | | | | | | | | | | * Importing webpage elements from manually entered cloud file path work. All de...Andrew Manning2016-07-173-7/+26
| | | | | | | | | | | | * Merge remote-tracking branch 'upstream/dev' into website-importAndrew Manning2016-07-175-21/+48
| | | | | | | | | | | | |\ | | | | | | | | | | |_|_|/ | | | | | | | | | |/| | |
| | | | | | | | | * | | | hide fullscreen button in embedphotos modal album viewMario Vavti2016-07-172-1/+3
| | | | | | | | |/ / / /
| | | | | | | | * | | | boobooredmatrix2016-07-171-2/+2
| | | | | | | | * | | | some work on guest access token uiMario Vavti2016-07-173-37/+45
| | | | | | | | | | | * Added functions to check cloud files path and return path with hashed namesAndrew Manning2016-07-174-56/+91
| | | | | | | | | | | * Merge remote-tracking branch 'upstream/dev' into website-import-remoteAndrew Manning2016-07-1634-2397/+2326
| | | | | | | | | | | |\ | | | | | | | | | |_|_|/ | | | | | | | | |/| | |
| | | | | | | | * | | | 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