Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-12-06 | 1 | -25/+38 |
|\ | |||||
| * | missed a spot while resolving merge conflict | Mario Vavti | 2017-12-06 | 1 | -1/+1 |
| | | |||||
| * | resolve merge conflict | Mario Vavti | 2017-12-06 | 1 | -25/+38 |
| | | |||||
* | | synchronise an attach_move operation to clones | zotlabs | 2017-12-06 | 1 | -0/+5 |
|/ | |||||
* | mod_cloud: provide a themed page with an error notification on errors ↵ | zotlabs | 2017-12-05 | 1 | -0/+24 |
| | | | | instead of an obtuse XML error structure | ||||
* | disallow backslashes in wiki and wiki-page names | zotlabs | 2017-12-05 | 1 | -6/+14 |
| | |||||
* | explain what happened here | zotlabs | 2017-12-04 | 1 | -0/+3 |
| | |||||
* | fix mod display and others that require a non-zero profile_uid for updates | zotlabs | 2017-12-04 | 2 | -4/+9 |
| | |||||
* | We only require one Update module. The rest are superfluous. | zotlabs | 2017-12-04 | 10 | -392/+34 |
| | |||||
* | fix another PHP 7.2 warning | Mario Vavti | 2017-12-04 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-12-04 | 3 | -5/+55 |
|\ | |||||
| * | pagetitle lost importing a pdl element from conversation | zotlabs | 2017-12-03 | 2 | -2/+4 |
| | | |||||
| * | rename button | zotlabs | 2017-12-03 | 1 | -1/+1 |
| | | |||||
| * | chunked uploads for photos page | zotlabs | 2017-12-03 | 1 | -2/+50 |
| | | |||||
* | | mod hq: do not 404 if we have no item | Mario Vavti | 2017-12-04 | 1 | -49/+59 |
| | | |||||
* | | fix some pubstream on/off weirdness | Mario | 2017-12-03 | 3 | -3/+6 |
|/ | |||||
* | remove logging line | zotlabs | 2017-11-30 | 1 | -1/+0 |
| | |||||
* | Merge branch 'chunk' | zotlabs | 2017-11-30 | 1 | -2/+5 |
|\ | |||||
| * | more or less working chunked uploads on /cloud now. | zotlabs | 2017-11-30 | 1 | -0/+2 |
| | | |||||
| * | more chunk work | zotlabs | 2017-11-28 | 1 | -2/+3 |
| | | |||||
* | | fix issue #921 - default addressbook has no name | Mario | 2017-11-30 | 1 | -1/+1 |
| | | |||||
* | | use the same variable name consistently | zotlabs | 2017-11-29 | 1 | -1/+1 |
| | | |||||
* | | use httpsig auth for getfile | zotlabs | 2017-11-29 | 1 | -11/+46 |
|/ | |||||
* | set profile_uid in mod hq | Mario Vavti | 2017-11-28 | 1 | -0/+7 |
| | |||||
* | split liveUpdateInit() out of NavUpdate() so we do not need to wait for ↵ | Mario Vavti | 2017-11-28 | 1 | -1/+1 |
| | | | | initial ping to complete before we can init liveUpdate(). clean up main.js and bump version. | ||||
* | Merge pull request #917 from anaqreon/minimum-age | git-marijus | 2017-11-27 | 1 | -1/+5 |
|\ | | | | | Provide system config option for minimum registration age. | ||||
| * | Provide system config option for minimum registration age. | Andrew Manning | 2017-11-24 | 1 | -1/+5 |
| | | |||||
* | | fix mod like after recent changes | Mario Vavti | 2017-11-27 | 1 | -1/+1 |
| | | |||||
* | | pubstream comments and a few other bugfixes that were discovered along the way | zotlabs | 2017-11-26 | 7 | -51/+109 |
| | | |||||
* | | implement pubstream items in mod hq | Mario | 2017-11-25 | 1 | -11/+36 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-25 | 5 | -8/+66 |
|\ \ | |||||
| * | | default profile assign | zotlabs | 2017-11-24 | 1 | -1/+8 |
| | | | |||||
| * | | sync packet not generated when deleting a file using the web browser interface | zotlabs | 2017-11-24 | 1 | -0/+5 |
| | | | |||||
| * | | remove deprecated $a argument from advanced_profile() | zotlabs | 2017-11-23 | 1 | -1/+1 |
| | | | |||||
| * | | change to bbcode calling parameters: important: will require pulling addons; | zotlabs | 2017-11-23 | 2 | -10/+16 |
| | | | | | | | | | | | | also some extra checking of server headers in upload functions | ||||
| * | | mod_file_upload: provide a handler for chunked uploads for when we ↵ | zotlabs | 2017-11-22 | 1 | -0/+40 |
| | | | | | | | | | | | | eventually support this on the client side | ||||
* | | | mod hq: minor query change | Mario Vavti | 2017-11-24 | 1 | -10/+2 |
| |/ |/| | |||||
* | | missing files | Mario Vavti | 2017-11-24 | 1 | -0/+31 |
| | | |||||
* | | some more work on mod hq | Mario Vavti | 2017-11-24 | 2 | -10/+11 |
|/ | |||||
* | article feature | zotlabs | 2017-11-22 | 5 | -1/+278 |
| | |||||
* | initial articles feature | zotlabs | 2017-11-22 | 1 | -0/+187 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-11-21 | 1 | -11/+11 |
|\ | |||||
| * | use item_thread_top = 1 instead of mid = parent_mid and make sure ↵ | Mario Vavti | 2017-11-21 | 1 | -3/+3 |
| | | | | | | | | local_channel is intval | ||||
| * | make browser history buttons work with ajax calls in /display and /hq | Mario Vavti | 2017-11-21 | 1 | -8/+8 |
| | | |||||
* | | expose the security setting for SVG thumbnails | zotlabs | 2017-11-21 | 1 | -1/+3 |
|/ | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-11-20 | 1 | -1/+2 |
|\ | |||||
| * | cloud tiles: use folder-o for folders and set the icon colour to something a ↵ | zotlabs | 2017-11-19 | 1 | -1/+2 |
| | | | | | | | | bit less harsh than the link colour for system icons. Dark solid blue folders are a bit overwhelming, as is the default text_colour (black) | ||||
* | | we need a mid also if there is no unseen items | Mario Vavti | 2017-11-20 | 1 | -1/+0 |
| | | |||||
* | | order by created instead of id | Mario Vavti | 2017-11-20 | 1 | -1/+1 |
| | | |||||
* | | speed up initial query if no mid is provided | Mario Vavti | 2017-11-20 | 1 | -0/+1 |
|/ |