Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | attach_delete() - remove photo resources even if the attach table row wasn't ↵ | zotlabs | 2017-01-15 | 2 | -14/+24 |
|/ / | | | | | | | found. | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-13 | 4 | -15/+19 |
|\ \ | |||||
| * | | another try on preventing double scrollbars when a modal is larger than the ↵ | Mario Vavti | 2017-01-13 | 2 | -2/+2 |
| | | | | | | | | | | | | viewport | ||||
| * | | evert "prevent double scrollbar when we have a modal larger than the viewport" | Mario Vavti | 2017-01-13 | 2 | -2/+1 |
| | | | | | | | | | | | | This reverts commit 2ace4c57d0a1b5d0030139c28d7d72e071d8b4d8. | ||||
| * | | prevent double scrollbar when we have a modal larger than the viewport | Mario Vavti | 2017-01-13 | 2 | -1/+2 |
| | | | |||||
| * | | possibly improve the album list query and save the result in App::$data | Mario Vavti | 2017-01-13 | 2 | -13/+17 |
| | | | |||||
* | | | several minor app nits | zotlabs | 2017-01-13 | 7 | -13/+23 |
| | | | |||||
* | | | string update | zotlabs | 2017-01-13 | 1 | -561/+586 |
|/ / | |||||
* | | default cover photo support. | zotlabs | 2017-01-12 | 4 | -5/+18 |
| | | |||||
* | | missing protect_sprintf which is the source of issue #642 - if a mention ↵ | zotlabs | 2017-01-12 | 1 | -2/+2 |
| | | | | | | | | search contains % it will result in an SQL vsprintf error | ||||
* | | fullscreen in album-view is disfunctional atm | Mario Vavti | 2017-01-12 | 2 | -6/+0 |
| | | |||||
* | | we should actually check for existance of a given album at this place. this ↵ | Mario Vavti | 2017-01-12 | 1 | -6/+1 |
| | | | | | | | | query can probably be more simple though | ||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-01-11 | 2 | -3/+5 |
|\ \ | |||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-01-11 | 3 | -4/+7 |
| |\ \ | |||||
| * | | | expires lost during edit | zotlabs | 2017-01-11 | 2 | -3/+5 |
| | | | | |||||
* | | | | comment out redundant querys | Mario Vavti | 2017-01-11 | 2 | -4/+11 |
| |/ / |/| | | |||||
* | | | fix embedimage if an albumname contains quotes | Mario Vavti | 2017-01-11 | 3 | -4/+7 |
|/ / | |||||
* | | btlogger trace file logging not working as desired. | zotlabs | 2017-01-10 | 1 | -4/+7 |
| | | |||||
* | | normalise feed id | zotlabs | 2017-01-10 | 1 | -9/+16 |
| | |