Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | Hubzilla | 2017-01-21 | 1 | -1/+5 |
|\ \ | |||||
| * | | add observer.language to autocomplete and return a default value for observer | Mario Vavti | 2017-01-21 | 1 | -1/+5 |
| | | | |||||
* | | | remove the channel introduction on the system notifications page. "Hubzilla, ↵ | Hubzilla | 2017-01-21 | 2 | -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.1 | Mario Vavti | 2017-01-21 | 1 | -2/+4 |
| | | |||||
* | | add bbcode language conditionals to wiki | Hubzilla | 2017-01-20 | 2 | -25/+33 |
| | | |||||
* | | observer.language!={something} for completeness | Hubzilla | 2017-01-20 | 1 | -0/+17 |
| | | |||||
* | | language aware content | Hubzilla | 2017-01-20 | 2 | -0/+22 |
| | | |||||
* | | js errors with raw message-id, string update | Hubzilla | 2017-01-20 | 4 | -700/+869 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | Hubzilla | 2017-01-19 | 2 | -2/+2 |
|\ \ | |||||
| * | | we need channel_id here not the whole channel | Mario Vavti | 2017-01-19 | 2 | -2/+2 |
| | | | |||||
* | | | add gen_link_id() function to selectively encode/decode the message-id ↵ | Hubzilla | 2017-01-19 | 10 | -18/+31 |
|/ / | | | | | | | 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 | 7 | -671/+7 |
| | | |||||
* | | urlencode the message-id component of generated /display/ links; in most ↵ | Hubzilla | 2017-01-18 | 7 | -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 updates | Hubzilla | 2017-01-18 | 4 | -33/+17 |
| | | |||||
* | | nwiki updates | Hubzilla | 2017-01-18 | 3 | -203/+267 |
| | | |||||
* | | more work on native wiki - revert now works; still remaining: diff, ↵ | zotlabs | 2017-01-17 | 5 | -4/+896 |
| | | | | | | | | delete-page, rename-page and export wiki. | ||||
* | | native wiki stuff | zotlabs | 2017-01-17 | 4 | -17/+39 |
| | | |||||
* | | daemon_addon hook - lets plugins create custom background processes. | zotlabs | 2017-01-17 | 3 | -0/+32 |
| | | |||||
* | | 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 | 3 | -1/+21 |
| | | | |||||
* | | | array pointer in wrong place | zotlabs | 2017-01-15 | 1 | -1/+1 |
| | | | |||||
* | | | more integration of vcard and profiles | zotlabs | 2017-01-15 | 3 | -4/+41 |
| | | | |||||
* | | | Still trying to make the documentation link just a wee bit more obvious. | zotlabs | 2017-01-15 | 2 | -2/+3 |
| | | |