Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into perms | redmatrix | 2016-07-05 | 6 | -343/+297 |
|\ | |||||
| * | unused file | redmatrix | 2016-07-05 | 1 | -35/+0 |
| * | merge include/reddav.php into Zotlabs/Storage/Directory.php | redmatrix | 2016-07-05 | 2 | -303/+280 |
| * | cleanup | redmatrix | 2016-07-05 | 1 | -2/+14 |
| * | regression - save bookmarks no longer present in item menu | redmatrix | 2016-07-05 | 2 | -3/+3 |
* | | start to refactor the permission roles | redmatrix | 2016-07-04 | 2 | -23/+175 |
* | | more heavy lifting on xtensible perms | redmatrix | 2016-07-04 | 5 | -242/+256 |
* | | more heavy lifting on extensible perms | redmatrix | 2016-07-04 | 3 | -16/+38 |
* | | some perms fixes to stuff that was already written before I move on | redmatrix | 2016-07-04 | 3 | -36/+48 |
* | | minor | redmatrix | 2016-07-04 | 1 | -1/+1 |
* | | perms work - settings page | redmatrix | 2016-07-03 | 1 | -20/+13 |
* | | make permissionlimits into a class | redmatrix | 2016-07-03 | 2 | -8/+46 |
* | | more work on x permissions | redmatrix | 2016-07-03 | 3 | -0/+139 |
* | | Merge branch 'dev' into perms | redmatrix | 2016-07-03 | 315 | -11811/+14396 |
|\| | |||||
| * | Merge pull request #448 from Treer/avatars | hubzilla | 2016-07-04 | 4 | -2/+89 |
| |\ | |||||
| | * | force immediate avatar update | Treer | 2016-07-03 | 3 | -0/+87 |
| | * | Mark nickname as required field, if left empty then channel creation fails si... | Treer | 2016-07-03 | 1 | -2/+2 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-01 | 7 | -41/+30 |
| |\ | |||||
| | * | use visibility instead of display to hide elements | Mario Vavti | 2016-07-01 | 1 | -2/+2 |
| | * | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 6 | -39/+28 |
| * | | delivery invoked twice in mod_tagger, once in post_activity_item() and anothe... | redmatrix | 2016-07-01 | 2 | -14/+6 |
| * | | use small photo for Diaspora attribution correction; the medium looks awkward... | redmatrix | 2016-07-01 | 2 | -2/+11 |
| |/ | |||||
| * | allow multiple apd's per plugin dir | redmatrix | 2016-07-01 | 3 | -3528/+3567 |
| * | if cron is broken because the entire db or config table is crashed, don't sen... | redmatrix | 2016-06-30 | 1 | -0/+9 |
| * | disable wiki if feature disabled, sync updates of delayed publish posts | redmatrix | 2016-06-30 | 3 | -2/+17 |
| * | sync flags even if post has not been edited | redmatrix | 2016-06-30 | 2 | -20/+24 |
| * | Merge pull request #445 from anaqreon/wiki | hubzilla | 2016-07-01 | 3 | -3/+81 |
| |\ | |||||
| | * | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-06-30 | 319 | -8242/+10673 |
| | |\ | | |/ | |/| | |||||
| * | | update moment.js to version 2.13 | Mario Vavti | 2016-06-30 | 4 | -50/+423 |
| * | | dreport: convert timestamp to channel localtime and get rid of old pre-templa... | redmatrix | 2016-06-29 | 1 | -11/+1 |
| * | | templatise the Dreport page and add a redeliver option for when things stuff ... | redmatrix | 2016-06-29 | 2 | -9/+64 |
| * | | wiki featured disabled by default in UNO. | redmatrix | 2016-06-29 | 1 | -1/+1 |
| * | | provide wiki as a feature (default is on so there aren't any surprises) and a... | redmatrix | 2016-06-29 | 4 | -5/+29 |
| * | | only request geolocation permission if we're creating a post. | redmatrix | 2016-06-29 | 1 | -1/+1 |
| * | | stream large photos through buffered I/O if possible | redmatrix | 2016-06-29 | 2 | -4/+28 |
| * | | Merge pull request #444 from git-marijus/dev | hubzilla | 2016-06-30 | 252 | -7354/+9154 |
| |\ \ | |||||
| | * \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-29 | 3 | -2/+43 |
| | |\ \ | |||||
| | * | | | update to sabre/dav to version 3.2.0 | Mario Vavti | 2016-06-28 | 21 | -224/+319 |
| | * | | | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 1 | -1/+7 |
| | |\ \ \ | |||||
| | * \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 10 | -71/+267 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-28 | 17 | -705/+555 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 1 | -8/+12 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-27 | 30 | -30/+98 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-26 | 5 | -36/+199 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-25 | 7 | -53/+59 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-24 | 26 | -3696/+3867 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-23 | 8 | -24/+36 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | erge branch 'dev' into sabre32 | Mario Vavti | 2016-06-22 | 14 | -77/+842 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-21 | 10 | -50/+565 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'dev' into sabre32 | Mario Vavti | 2016-06-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |