Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Updated import_blocks for database calls | Andrew Manning | 2016-07-13 | 1 | -5/+3 | |
* | | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-13 | 3 | -20/+12 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | missing namespace prefix \ | redmatrix | 2016-07-12 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
| * | | | | | | | | update_remote_id - updated to work with iconfig | redmatrix | 2016-07-12 | 1 | -18/+5 | |
| * | | | | | | | | don't try to send sync packets to dead sites. | redmatrix | 2016-07-12 | 1 | -1/+6 | |
* | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into website-import | Andrew Manning | 2016-07-12 | 27 | -56/+54 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | the abconfig defaults weren't changed in the schema files when they were chan... | redmatrix | 2016-07-12 | 2 | -2/+2 | |
| * | | | | | | | | move permissiondescription class to zotlabs/lib | redmatrix | 2016-07-11 | 11 | -26/+12 | |
| * | | | | | | | | use the get_hostname function rather than parse the url | redmatrix | 2016-07-11 | 1 | -1/+1 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | document the new change_channel hook | redmatrix | 2016-07-11 | 2 | -0/+14 | |
| * | | | | | | | create change_channel hook | redmatrix | 2016-07-11 | 1 | -0/+4 | |
| * | | | | | | | force non-null sess_data | redmatrix | 2016-07-11 | 1 | -1/+2 | |
| * | | | | | | | use the profile_uid here. | redmatrix | 2016-07-11 | 1 | -7/+2 | |
| * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | redmatrix | 2016-07-11 | 8 | -18/+16 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-11 | 1 | -5/+0 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge pull request #451 from git-marijus/dev | hubzilla | 2016-07-11 | 1 | -5/+0 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | remove check for mcrypt | Mario Vavti | 2016-07-10 | 1 | -5/+0 | |
| | | | * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-10 | 5 | -1284/+1313 | |
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | | | * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-07 | 2 | -19/+10 | |
| | | | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | do not use visibility for fullscreen button and move fullscreen button to the... | Mario Vavti | 2016-07-11 | 7 | -13/+16 | |
| | |/ / / / / / / / / | ||||||
| * / / / / / / / / / | more sql fine tuning | redmatrix | 2016-07-09 | 1 | -1/+1 | |
| |/ / / / / / / / / | ||||||
* | | | | | | | | | | Import blocks from zip file, but needs updates as detailed in https://gitlab.... | Andrew Manning | 2016-07-12 | 2 | -2/+224 | |
* | | | | | | | | | | Clearer import control interface | Andrew Manning | 2016-07-10 | 2 | -8/+28 | |
* | | | | | | | | | | First draft of website import tools | Andrew Manning | 2016-07-10 | 4 | -0/+46 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Set max-width for embedded images | Andrew Manning | 2016-07-09 | 1 | -0/+4 | |
* | | | | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-09 | 22 | -1674/+1724 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | some work on the forum widget queries | redmatrix | 2016-07-09 | 2 | -1273/+1292 | |
| * | | | | | | | | gak one more typo | redmatrix | 2016-07-07 | 1 | -1/+1 | |
| * | | | | | | | | typo | redmatrix | 2016-07-07 | 1 | -1/+1 | |
| * | | | | | | | | duplicate supression SQL query was horribly inefficient and could cause issue... | redmatrix | 2016-07-07 | 1 | -11/+13 | |
| * | | | | | | | | Merge pull request #450 from git-marijus/dev | hubzilla | 2016-07-08 | 3 | -14/+2 | |
| |\| | | | | | | | ||||||
| | * | | | | | | | more fixes for /cloud and /dav | Mario Vavti | 2016-07-07 | 3 | -13/+2 | |
| | * | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2016-07-06 | 10 | -345/+386 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | ||||||
| | * | | | | | | | fix /cloud after recent changes | Mario Vavti | 2016-07-06 | 1 | -2/+1 | |
| * | | | | | | | | hide the redeliver option one level down since it should rarely be needed by ... | redmatrix | 2016-07-07 | 2 | -1/+9 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
| * | | | | | | | reduce the memory usage of the expire query dramatically. | redmatrix | 2016-07-06 | 1 | -19/+10 | |
| * | | | | | | | expire crashing on shared hosting from memory exhaustion. Lower the expire li... | redmatrix | 2016-07-06 | 2 | -2/+2 | |
| | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | 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 | |
| | |_|_|/ / | |/| | | | | ||||||
| * | | | | | 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 | |
| * | | | | | 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 | |
* | | | | | | Merge remote-tracking branch 'upstream/dev' into wiki | Andrew Manning | 2016-07-01 | 15 | -3589/+3645 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | ditch the change_view widget and make header fixed in fullscreen mode | Mario Vavti | 2016-07-01 | 6 | -39/+28 | |
| |/ / / / |