| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-03-25 | 11 | -21/+29 |
|\ |
|
| * | move profile tabs to app-tray | Mario Vavti | 2017-03-20 | 9 | -9/+15 |
| * | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-19 | 2 | -4/+2 |
| |\ |
|
| * | | fix abook_edit and private mail | Mario Vavti | 2017-03-18 | 1 | -1/+1 |
| * | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-18 | 1 | -2/+1 |
| |\ \ |
|
| * | | | fix item_list and item_search templates. make item filer use a bootdtrap moda... | Mario Vavti | 2017-03-17 | 1 | -1/+3 |
| * | | | Merge branch 'dev' into bs4 | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| |\ \ \ |
|
| * | | | | many dropdown and class fixes. still a long way to go... | Mario Vavti | 2017-03-12 | 1 | -11/+11 |
* | | | | | get rid of 'davguest' and allow for project specific DB updates (currently db... | zotlabs | 2017-03-25 | 2 | -3/+1 |
* | | | | | allow setting the system email name/address/reply | zotlabs | 2017-03-22 | 1 | -0/+15 |
* | | | | | some more photo issues | zotlabs | 2017-03-22 | 1 | -24/+22 |
* | | | | | fix photo prvnxt after all the changes yesterday | zotlabs | 2017-03-22 | 1 | -6/+5 |
* | | | | | more work on the photo album mess | zotlabs | 2017-03-21 | 1 | -92/+65 |
* | | | | | photos_album_exists() requires an observer to work correctly; provide it. | zotlabs | 2017-03-21 | 1 | -2/+2 |
* | | | | | begin the process of using the relevant attach directory/path for photo album... | zotlabs | 2017-03-21 | 1 | -31/+14 |
* | | | | | even more fine tuning of the markdown purifier - especially when used with th... | zotlabs | 2017-03-20 | 1 | -0/+1 |
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-19 | 1 | -1/+1 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | fix php warning and remove logging | Mario Vavti | 2017-03-19 | 1 | -4/+2 |
* | | | | | Merge branch 'dev' into merge | zotlabs | 2017-03-18 | 1 | -0/+1 |
|\| | | | |
|
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-18 | 1 | -2/+1 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | Missed one old Markdown() | Klaus | 2017-03-18 | 1 | -2/+1 |
| | | |/
| | |/| |
|
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-15 | 2 | -18/+6 |
| |\| | |
|
| | * | | better handling of mimetype security | Mario Vavti | 2017-03-15 | 2 | -18/+6 |
| | |/ |
|
* | | | various input filter fixes | zotlabs | 2017-03-18 | 7 | -18/+34 |
* | | | remove include/widgets.php | zotlabs | 2017-03-16 | 4 | -11/+1 |
* | | | more work related to attach/photo and os_path, display_path and general code ... | zotlabs | 2017-03-15 | 2 | -36/+40 |
* | | | input filter updates | zotlabs | 2017-03-14 | 2 | -16/+6 |
* | | | code_allowed is a real mess. Start the cleanup by remving the account level c... | zotlabs | 2017-03-13 | 2 | -24/+4 |
* | | | better handling of mimetype security | zotlabs | 2017-03-12 | 2 | -18/+7 |
* | | | Merge branch 'dev' into red | zotlabs | 2017-03-11 | 1 | -1/+1 |
|\| | |
|
| * | | Monday is a proper name and should be capitalised (except in private conversa... | zotlabs | 2017-03-08 | 1 | -1/+1 |
| |/ |
|
* / | one role. | zotlabs | 2017-03-09 | 1 | -7/+0 |
|/ |
|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-02 | 1 | -1/+1 |
|\ |
|
| * | reset schema value after we empty and repopulate it. second half of fix for #624 | Mario Vavti | 2017-03-02 | 1 | -1/+1 |
* | | activity widget - like the forum widget but represents unseen activity by aut... | zotlabs | 2017-03-02 | 6 | -4/+29 |
|/ |
|
* | Merge pull request #686 from dawnbreak/markdown | zotlabs | 2017-03-01 | 3 | -87/+86 |
|\ |
|
| * | :arrow_up: :hammer: Upgrade PHP Markdown library. | Klaus Weidenbach | 2017-02-27 | 3 | -87/+86 |
* | | provide 'session' option to z_fetch_url to assist with remote fetches requiri... | zotlabs | 2017-02-27 | 1 | -1/+1 |
* | | make magic-auth work with profile vcard fetch | zotlabs | 2017-02-27 | 1 | -1/+2 |
* | | fetch profile vcard for connection | zotlabs | 2017-02-27 | 1 | -0/+45 |
* | | prep work | zotlabs | 2017-02-27 | 1 | -0/+1 |
|/ |
|
* | fix js issue in markdown mimetype wikis if content contains quotes | Mario Vavti | 2017-02-27 | 1 | -5/+3 |
* | set minversion and maxversion for themes in view/theme/themename/php/theme.ph... | Mario Vavti | 2017-02-27 | 2 | -4/+6 |
* | add a minversion to the theme and fallback to default if requirement is not m... | Mario Vavti | 2017-02-26 | 3 | -5/+18 |
* | send sync packet on profile photo permissions change | zotlabs | 2017-02-25 | 1 | -0/+9 |
* | escape tags on viewsrc output in case it is not text/bbcode. | zotlabs | 2017-02-25 | 1 | -1/+3 |
* | use chanlink_url() in directory since the xchan might not yet be available on... | Mario Vavti | 2017-02-24 | 1 | -1/+1 |
* | deleting profile vcard entries was pretty well borked | zotlabs | 2017-02-23 | 1 | -2/+4 |
* | more work on profile vcards - still a lot of work to go | zotlabs | 2017-02-23 | 1 | -9/+27 |
* | more places to use chanlink_hash() instead of chanlink_url() for profile_link | Mario Vavti | 2017-02-23 | 3 | -3/+3 |