aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-253-26/+15
|\
| * Merge pull request #653 from git-marijus/devzotlabs2017-01-263-26/+15
| |\ | | | | | | fixes for wiki create/delete page
| | * fixes for wiki create/delete pageMario Vavti2017-01-253-26/+15
| |/
* / initialise item['postopts'] for mysql >= 5.7zotlabs2017-01-251-0/+1
|/
* typozotlabs2017-01-241-1/+1
|
* always sync parent wiki when syncing pages, just in case the original wiki ↵zotlabs2017-01-242-9/+13
| | | | creation wasn't synced.
* minorzotlabs2017-01-241-3/+3
|
* block well-known from oembedzotlabs2017-01-241-0/+3
|
* initial selections for extensible permission categories ("permcats")zotlabs2017-01-241-0/+42
|
* do not show location row on small viewports.Mario Vavti2017-01-241-2/+2
|
* nav-login - basic, crude themingzotlabs2017-01-232-4/+15
|
* put login form into the nav bar. Proof of concept - needs a bit of UI tweaks.zotlabs2017-01-235-4/+28
|
* add observer.language to the docozotlabs2017-01-231-0/+16
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-01-231-1/+1
|\
| * give apps a bit more horizontal spaceMario Vavti2017-01-231-1/+1
| |
* | remnant code that checked for version to see if an app was installed. We do ↵zotlabs2017-01-231-2/+1
|/ | | | that differently now.
* synced wikis should be relocatedHubzilla2017-01-221-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeHubzilla2017-01-222-1293/+1511
|\
| * Merge pull request #650 from mjfriaza/devzotlabs2017-01-232-1293/+1511
| |\ | | | | | | Translation of the new strings into the Spanish version
| | * Translation of the new strings into the Spanish versionManuel Jiménez Friaza2017-01-222-1293/+1511
| | |
* | | basic support for clone syncing of wikis and wiki pagesHubzilla2017-01-227-18/+58
|/ /
* | force app icons to fixed widthHubzilla2017-01-221-1/+1
| |
* | use icons for app photos.Hubzilla2017-01-223-3/+11
| |
* | some work on app_bin - just to get it goingMario Vavti2017-01-223-17/+60
| |
* | $a is deprecatedMario Vavti2017-01-221-1/+1
| |
* | whitespace cleanupMario Vavti2017-01-221-8/+5
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeHubzilla2017-01-211-1/+5
|\ \
| * | add observer.language to autocomplete and return a default value for observerMario Vavti2017-01-211-1/+5
| | |
* | | remove the channel introduction on the system notifications page. "Hubzilla, ↵Hubzilla2017-01-212-3/+4
|/ / | | | | | | George commented on your status 20 minutes ago". We need the channel introduction (in this case "Hubzilla," in emails for situations where one person controls a lot of channels. We don't need it on the web notification summary; where you're only viewing notifications for a single given channel.
* | fix text highlighter for PHP version 7.1Mario Vavti2017-01-211-2/+4
| |
* | add bbcode language conditionals to wikiHubzilla2017-01-202-25/+33
| |
* | observer.language!={something} for completenessHubzilla2017-01-201-0/+17
| |
* | language aware contentHubzilla2017-01-202-0/+22
| |
* | js errors with raw message-id, string updateHubzilla2017-01-204-700/+869
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergeHubzilla2017-01-192-2/+2
|\ \
| * | we need channel_id here not the whole channelMario Vavti2017-01-192-2/+2
| | |
* | | add gen_link_id() function to selectively encode/decode the message-id ↵Hubzilla2017-01-1910-18/+31
|/ / | | | | | | component of /display/ links for message-ids that contain troublesome characters
* | more urlencoding of message-ids which are used in linksHubzilla2017-01-187-671/+7
| |
* | urlencode the message-id component of generated /display/ links; in most ↵Hubzilla2017-01-187-16/+11
| | | | | | | | cases this will be a no-op, unless the message-id is a url of some kind from a different provider.
* | native wiki updatesHubzilla2017-01-184-33/+17
| |
* | nwiki updatesHubzilla2017-01-183-203/+267
| |
* | more work on native wiki - revert now works; still remaining: diff, ↵zotlabs2017-01-175-4/+896
| | | | | | | | delete-page, rename-page and export wiki.
* | native wiki stuffzotlabs2017-01-174-17/+39
| |
* | daemon_addon hook - lets plugins create custom background processes.zotlabs2017-01-173-0/+32
| |
* | Merge pull request #645 from git-marijus/devzotlabs2017-01-162-1/+7
|\ \ | | | | | | do not choke if photo_factory() returns null
| * | do not choke if photo_factory() returns nullMario Vavti2017-01-152-1/+7
| | |
* | | vcard export from profilezotlabs2017-01-153-1/+21
| | |
* | | array pointer in wrong placezotlabs2017-01-151-1/+1
| | |
* | | more integration of vcard and profileszotlabs2017-01-153-4/+41
| | |
* | | Still trying to make the documentation link just a wee bit more obvious.zotlabs2017-01-152-2/+3
| | |