Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve merge conflict | Mario Vavti | 2017-02-02 | 1 | -1/+1 |
|\ | |||||
| * | fix a few style issues with nav login panel | zotlabs | 2017-02-01 | 1 | -1/+1 |
| | | |||||
* | | remove experimental_app_bin config conditional | Mario Vavti | 2017-02-01 | 1 | -19/+17 |
|/ | |||||
* | superfluous whitespace cleanup | zotlabs | 2017-01-31 | 2 | -351/+358 |
| | |||||
* | move diaspora account import to the diaspora plugin | zotlabs | 2017-01-31 | 1 | -148/+0 |
| | |||||
* | channel export - use a selected list of functional data categories to ↵ | zotlabs | 2017-01-31 | 3 | -164/+234 |
| | | | | export; this allows one to export single data sets instead of always exporting everything we know about | ||||
* | hide featured app category in the app category widget | Mario Vavti | 2017-01-31 | 2 | -1/+2 |
| | |||||
* | fix typos | Mario Vavti | 2017-01-31 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-30 | 1 | -3/+10 |
|\ | |||||
| * | Merge pull request #662 from anaqreon/affinity-settings | zotlabs | 2017-01-30 | 1 | -3/+10 |
| |\ | | | | | | | Affinity settings | ||||
| | * | Remove unrelated chatroom panel stuff that was included accidentally | Andrew Manning | 2017-01-29 | 1 | -69/+0 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/dev' into affinity-settings | Andrew Manning | 2017-01-29 | 8 | -193/+274 |
| | |\ | |||||
| | * | | Add affinity slider tool settings for min and max defaults in settings/featured | Andrew Manning | 2017-01-29 | 1 | -3/+79 |
| | | | | |||||
* | | | | consolidate hubloc storage | zotlabs | 2017-01-30 | 11 | -62/+97 |
|/ / / | |||||
* | / | queue optimisations for sites that have lingered in the queue for more than ↵ | zotlabs | 2017-01-29 | 1 | -1/+16 |
| |/ |/| | | | | | a couple of days. | ||||
* | | finish remaining places where xchan_store_lowlevel needs to be used | zotlabs | 2017-01-29 | 1 | -12/+0 |
| | | |||||
* | | Alter the queue so that each queue item stores the scheduled time of the ↵ | zotlabs | 2017-01-29 | 1 | -4/+42 |
| | | | | | | | | | | | | | | | | 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 | 7 | -180/+235 |
|/ | | | | initialised | ||||
* | more work on app-bin | Mario Vavti | 2017-01-27 | 1 | -2/+3 |
| | |||||
* | better handling of html special chars in wiki and wikipage names | zotlabs | 2017-01-26 | 1 | -5/+5 |
| | |||||
* | haystack/needle mixup | Mario Vavti | 2017-01-26 | 1 | -1/+1 |
| | |||||
* | resolve the linked item delete issue by declaring what types of linked items ↵ | zotlabs | 2017-01-25 | 1 | -1/+6 |
| | | | | cannot be deleted | ||||
* | only allow wiki owner to delete pages | zotlabs | 2017-01-25 | 2 | -2/+5 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-25 | 1 | -2/+5 |
|\ | |||||
| * | fixes for wiki create/delete page | Mario Vavti | 2017-01-25 | 1 | -2/+5 |
| | | |||||
* | | initialise item['postopts'] for mysql >= 5.7 | zotlabs | 2017-01-25 | 1 | -0/+1 |
|/ | |||||
* | minor | zotlabs | 2017-01-24 | 1 | -3/+3 |
| | |||||
* | block well-known from oembed | zotlabs | 2017-01-24 | 1 | -0/+3 |
| | |||||
* | put login form into the nav bar. Proof of concept - needs a bit of UI tweaks. | zotlabs | 2017-01-23 | 2 | -0/+16 |
| | |||||
* | synced wikis should be relocated | Hubzilla | 2017-01-22 | 1 | -1/+1 |
| | |||||
* | basic support for clone syncing of wikis and wiki pages | Hubzilla | 2017-01-22 | 3 | -2/+17 |
| | |||||
* | some work on app_bin - just to get it going | Mario Vavti | 2017-01-22 | 1 | -1/+28 |
| | |||||
* | $a is deprecated | Mario Vavti | 2017-01-22 | 1 | -1/+1 |
| | |||||
* | whitespace cleanup | Mario Vavti | 2017-01-22 | 1 | -8/+5 |
| | |||||
* | observer.language!={something} for completeness | Hubzilla | 2017-01-20 | 1 | -0/+17 |
| | |||||
* | language aware content | Hubzilla | 2017-01-20 | 1 | -0/+20 |
| | |||||
* | js errors with raw message-id, string update | Hubzilla | 2017-01-20 | 1 | -1/+2 |
| | |||||
* | add gen_link_id() function to selectively encode/decode the message-id ↵ | Hubzilla | 2017-01-19 | 4 | -5/+12 |
| | | | | component of /display/ links for message-ids that contain troublesome characters | ||||
* | more urlencoding of message-ids which are used in links | Hubzilla | 2017-01-18 | 4 | -668/+4 |
| | |||||
* | urlencode the message-id component of generated /display/ links; in most ↵ | Hubzilla | 2017-01-18 | 3 | -5/+5 |
| | | | | cases this will be a no-op, unless the message-id is a url of some kind from a different provider. | ||||
* | native wiki updates | Hubzilla | 2017-01-18 | 1 | -27/+12 |
| | |||||
* | more work on native wiki - revert now works; still remaining: diff, ↵ | zotlabs | 2017-01-17 | 1 | -3/+15 |
| | | | | delete-page, rename-page and export wiki. | ||||
* | native wiki stuff | zotlabs | 2017-01-17 | 2 | -13/+31 |
| | |||||
* | Merge pull request #645 from git-marijus/dev | zotlabs | 2017-01-16 | 2 | -1/+7 |
|\ | | | | | do not choke if photo_factory() returns null | ||||
| * | do not choke if photo_factory() returns null | Mario Vavti | 2017-01-15 | 2 | -1/+7 |
| | | |||||
* | | vcard export from profile | zotlabs | 2017-01-15 | 1 | -0/+4 |
| | | |||||
* | | array pointer in wrong place | zotlabs | 2017-01-15 | 1 | -1/+1 |
| | | |||||
* | | more integration of vcard and profiles | zotlabs | 2017-01-15 | 2 | -1/+10 |
| | | |||||
* | | Still trying to make the documentation link just a wee bit more obvious. | zotlabs | 2017-01-15 | 1 | -0/+1 |
| | | |||||
* | | attach_delete() - remove photo resources even if the attach table row wasn't ↵ | zotlabs | 2017-01-15 | 1 | -12/+23 |
|/ | | | | found. |