| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 2 | -3/+3 |
| |\ | |||||
| | * | Merge branch '1.10RC' into dev | Mario Vavti | 2016-07-20 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC | Mario Vavti | 2016-07-20 | 2 | -0/+7 |
| | | |\ | |||||
| | | | * | Merge pull request #456 from anaqreon/1.10RC-updates | git-marijus | 2016-07-20 | 2 | -0/+7 |
| | | | |\ | | | | | | | | | | | Wiki delete page confirmation and max image width | ||||
| | | | | * | Wiki delete page confirmation and max image width | Andrew Manning | 2016-07-20 | 2 | -0/+7 |
| | | | | | | |||||
| | | * | | | type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as ↵ | Mario Vavti | 2016-07-20 | 1 | -1/+1 |
| | | |/ / | | | | | | | | | | | | | id. This fixes the issue that autocomplete for mail returns null for data.xid | ||||
| | * | | | Merge pull request #455 from anaqreon/wiki | git-marijus | 2016-07-20 | 2 | -0/+7 |
| | |\ \ \ | | | | | | | | | | | Wiki delete page confirmation and max image width | ||||
| | | * \ \ | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-20 | 70 | -2515/+2531 |
| | | |\ \ \ | |||||
| | * | \ \ \ | Merge branch '1.10RC' into dev | Mario Vavti | 2016-07-20 | 1 | -2/+2 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | | * | | | fix /mail wsod issue reported by giac hellvecio | Mario Vavti | 2016-07-20 | 1 | -2/+2 |
| | | | |/ | | |/| | |||||
| | | * | | Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge | redmatrix | 2016-07-18 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | * | | | runaway cron emails | redmatrix | 2016-07-18 | 1 | -10/+2 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-20 | 9 | -15/+52 |
| |\| | | | | |||||
| | * | | | | doc correction | redmatrix | 2016-07-19 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | issue #411 | redmatrix | 2016-07-19 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | runaway cron emails | redmatrix | 2016-07-18 | 1 | -10/+2 |
| | | | | | | |||||
| | * | | | | whitespace | Mario Vavti | 2016-07-18 | 1 | -2/+0 |
| | | | | | | |||||
| | * | | | | resolve merge conflict | Mario Vavti | 2016-07-18 | 2 | -1/+3 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | do not transform hashes to tags in [code=xxx] or [code] blocks | Mario Vavti | 2016-07-18 | 1 | -1/+1 |
| | | |/ / | |||||
| | | * | | update changelog | redmatrix | 2016-07-17 | 1 | -0/+41 |
| | | | | | |||||
| | | * | | jquery update issue prevents comments from reloading and resetting watch cursor | redmatrix | 2016-07-17 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | change std_version | redmatrix | 2016-07-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | roll version | redmatrix | 2016-07-17 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | update changelog | redmatrix | 2016-07-17 | 1 | -0/+41 |
| | | | | | |||||
| | * | | | jquery update issue prevents comments from reloading and resetting watch cursor | redmatrix | 2016-07-17 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-17 | 2 | -1/+3 |
| | |\ \ | |||||
| | * | | | include attach.php at the module level since 2d4b75428a87038 wasn't ↵ | redmatrix | 2016-07-17 | 3 | -1/+4 |
| | | | | | | | | | | | | | | | | | backported to dev and we're about to branch an RC | ||||
| * | | | | Starting to make the import selection page after element scan. | Andrew Manning | 2016-07-20 | 3 | -80/+176 |
| | | | | | |||||
| * | | | | Importing webpage elements from manually entered cloud file path work. All ↵ | Andrew Manning | 2016-07-17 | 3 | -7/+26 |
| | | | | | | | | | | | | | | | | | detected elements are automatically imported. | ||||
| * | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-17 | 5 | -21/+48 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | hide fullscreen button in embedphotos modal album view | Mario Vavti | 2016-07-17 | 2 | -1/+3 |
| | |/ / | |||||
| | * | | booboo | redmatrix | 2016-07-17 | 1 | -2/+2 |
| | | | | |||||
| | * | | some work on guest access token ui | Mario Vavti | 2016-07-17 | 3 | -37/+45 |
| | | | | |||||
| * | | | Added functions to check cloud files path and return path with hashed names | Andrew Manning | 2016-07-17 | 4 | -56/+91 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/dev' into website-import-remote | Andrew Manning | 2016-07-16 | 34 | -2397/+2326 |
| |\| | | |||||
| | * | | check for variables after schema files have been added | Mario Vavti | 2016-07-16 | 1 | -12/+12 |
| | | | | |||||
| | * | | check for variables in schemes | Mario Vavti | 2016-07-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | hide/show mixup | Mario Vavti | 2016-07-16 | 1 | -3/+2 |
| | | | | |||||
| | * | | only use visibility for tabs | Mario Vavti | 2016-07-16 | 1 | -4/+4 |
| | | | | |||||
| | * | | os_delete_prohibit | redmatrix | 2016-07-16 | 1 | -0/+4 |
| | | | | |||||
| | * | | add new service class restriction to the doco | redmatrix | 2016-07-15 | 1 | -0/+1 |
| | | | | |||||
| | * | | add service class restrictions to access_tokens | redmatrix | 2016-07-15 | 2 | -1/+11 |
| | | | | |||||
| | * | | remove expired access tokens | redmatrix | 2016-07-15 | 1 | -0/+9 |
| | | | | |||||
| | * | | provide examples for using access tokens in urls | redmatrix | 2016-07-15 | 4 | -2/+20 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-15 | 12 | -541/+35 |
| | |\ \ | |||||
| | | * | | bump minor version because of jquery update | Mario Vavti | 2016-07-15 | 2 | -10/+3 |
| | | | | | |||||
| | | * | | round up height | Mario Vavti | 2016-07-15 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-15 | 5 | -1818/+1888 |
| | | |\ \ | |||||
| | | * | | | add jquery migrate for version 3 | Mario Vavti | 2016-07-15 | 1 | -0/+2 |
| | | | | | | |||||
| | | * | | | upgrade to jquery-3.1 and minor fixes | Mario Vavti | 2016-07-15 | 10 | -531/+30 |
| | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |