Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/dev' into affinity-settings | Andrew Manning | 2017-01-29 | 14 | -234/+324 |
|\ | |||||
| * | no quotes on dbutcnow() output | zotlabs | 2017-01-29 | 1 | -1/+1 |
| | | |||||
| * | finish remaining places where xchan_store_lowlevel needs to be used | zotlabs | 2017-01-29 | 2 | -31/+21 |
| | | |||||
| * | Alter the queue so that each queue item stores the scheduled time of the ↵ | zotlabs | 2017-01-29 | 6 | -26/+70 |
| | | | | | | | | | | | | | | | | next delivery. This keeps the query for queued items simple. We no longer group by posturl; as the queue update function will only keep one item per destination scheduled for shorter term processing. Others (multiple queued items for a single destination) will be scheduled for delivery far into the future and only delivered if the hub responds to the "active" or short term queue item. | ||||
| * | provide lowlevel xchan storage function to ensure that all non-null rows are ↵ | zotlabs | 2017-01-28 | 8 | -180/+236 |
| | | | | | | | | initialised | ||||
* | | Add affinity slider tool settings for min and max defaults in settings/featured | Andrew Manning | 2017-01-29 | 2 | -3/+108 |
|/ | |||||
* | string update | zotlabs | 2017-01-27 | 1 | -1278/+1352 |
| | |||||
* | more work on app-bin | Mario Vavti | 2017-01-27 | 4 | -9/+14 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-01-27 | 2 | -4/+7 |
|\ | |||||
| * | Merge remote-tracking branch 'upstream/dev' into addon-repo-gui | Andrew Manning | 2017-01-27 | 0 | -0/+0 |
| |\ | |||||
| * | | Improve context help with screenshot and replace "addon" with "plugin". | Andrew Manning | 2017-01-27 | 2 | -4/+7 |
| | | | |||||
* | | | add icons and links to appman and apps edit to app-bin | Mario Vavti | 2017-01-27 | 1 | -1/+4 |
| |/ |/| | |||||
* | | Merge pull request #655 from anaqreon/addon-repo-gui | zotlabs | 2017-01-27 | 3 | -10/+38 |
|\| | | | | | Addon repo management GUI | ||||
| * | Fixed numerous bugs with the addon repo management GUI. Only show Manage ↵ | Andrew Manning | 2017-01-26 | 3 | -10/+38 |
|/ | | | | Repos button if webserver has write permission on extend/addon/. | ||||
* | better handling of html special chars in wiki and wikipage names | zotlabs | 2017-01-26 | 4 | -36/+33 |
| | |||||
* | missing single quote in query | Mario Vavti | 2017-01-26 | 1 | -1/+1 |
| | |||||
* | minor cleanup | Mario Vavti | 2017-01-26 | 1 | -4/+1 |
| | |||||
* | query for item_hidden is not needed anymore | Mario Vavti | 2017-01-26 | 1 | -1/+1 |
| | |||||
* | fix wiki list template | Mario Vavti | 2017-01-26 | 2 | -6/+6 |
| | |||||
* | haystack/needle mixup | Mario Vavti | 2017-01-26 | 1 | -1/+1 |
| | |||||
* | fix renaming of wiki pages | Mario Vavti | 2017-01-26 | 2 | -12/+16 |
| | |||||
* | missing quote in nav template | zotlabs | 2017-01-25 | 1 | -1/+1 |
| | |||||
* | resolve the linked item delete issue by declaring what types of linked items ↵ | zotlabs | 2017-01-25 | 2 | -3/+8 |
| | | | | cannot be deleted | ||||
* | only allow wiki owner to delete pages | zotlabs | 2017-01-25 | 4 | -3/+12 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-25 | 3 | -26/+15 |
|\ | |||||
| * | Merge pull request #653 from git-marijus/dev | zotlabs | 2017-01-26 | 3 | -26/+15 |
| |\ | | | | | | | fixes for wiki create/delete page | ||||
| | * | fixes for wiki create/delete page | Mario Vavti | 2017-01-25 | 3 | -26/+15 |
| |/ | |||||
* / | initialise item['postopts'] for mysql >= 5.7 | zotlabs | 2017-01-25 | 1 | -0/+1 |
|/ | |||||
* | typo | zotlabs | 2017-01-24 | 1 | -1/+1 |
| | |||||
* | always sync parent wiki when syncing pages, just in case the original wiki ↵ | zotlabs | 2017-01-24 | 2 | -9/+13 |
| | | | | creation wasn't synced. | ||||
* | minor | zotlabs | 2017-01-24 | 1 | -3/+3 |
| | |||||
* | block well-known from oembed | zotlabs | 2017-01-24 | 1 | -0/+3 |
| | |||||
* | initial selections for extensible permission categories ("permcats") | zotlabs | 2017-01-24 | 1 | -0/+42 |
| | |||||
* | do not show location row on small viewports. | Mario Vavti | 2017-01-24 | 1 | -2/+2 |
| | |||||
* | nav-login - basic, crude theming | zotlabs | 2017-01-23 | 2 | -4/+15 |
| | |||||
* | put login form into the nav bar. Proof of concept - needs a bit of UI tweaks. | zotlabs | 2017-01-23 | 5 | -4/+28 |
| | |||||
* | add observer.language to the doco | zotlabs | 2017-01-23 | 1 | -0/+16 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-23 | 1 | -1/+1 |
|\ | |||||
| * | give apps a bit more horizontal space | Mario Vavti | 2017-01-23 | 1 | -1/+1 |
| | | |||||
* | | remnant code that checked for version to see if an app was installed. We do ↵ | zotlabs | 2017-01-23 | 1 | -2/+1 |
|/ | | | | that differently now. | ||||
* | synced wikis should be relocated | Hubzilla | 2017-01-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | Hubzilla | 2017-01-22 | 2 | -1293/+1511 |
|\ | |||||
| * | Merge pull request #650 from mjfriaza/dev | zotlabs | 2017-01-23 | 2 | -1293/+1511 |
| |\ | | | | | | | Translation of the new strings into the Spanish version | ||||
| | * | Translation of the new strings into the Spanish version | Manuel Jiménez Friaza | 2017-01-22 | 2 | -1293/+1511 |
| | | | |||||
* | | | basic support for clone syncing of wikis and wiki pages | Hubzilla | 2017-01-22 | 7 | -18/+58 |
|/ / | |||||
* | | force app icons to fixed width | Hubzilla | 2017-01-22 | 1 | -1/+1 |
| | | |||||
* | | use icons for app photos. | Hubzilla | 2017-01-22 | 3 | -3/+11 |
| | | |||||
* | | some work on app_bin - just to get it going | Mario Vavti | 2017-01-22 | 3 | -17/+60 |
| | | |||||
* | | $a is deprecated | Mario Vavti | 2017-01-22 | 1 | -1/+1 |
| | | |||||
* | | whitespace cleanup | Mario Vavti | 2017-01-22 | 1 | -8/+5 |
| | |