aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-285-1345/+1332
|\
| * I haven't investigated 'why', but the addition of the router class in https:/...redmatrix2016-02-271-0/+3
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-276-2697/+2670
| |\
| | * Merge pull request #302 from phellmes/de20160227redmatrix2016-02-282-1342/+1326
| | |\
| | | * Update DE translation stringsphellmes2016-02-272-1342/+1326
| * | | z_fetch_url and z_post_url returning falseredmatrix2016-02-272-3/+3
* | | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-274-1355/+1344
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-02-272-1355/+1339
| |\ \ \
| | * | | update NL stringsjeroenpraat2016-02-272-1355/+1339
| | | |/ | | |/|
| * / | missing includeMario Vavti2016-02-271-0/+1
| |/ /
| * / make attach_delete() return and comment out album rename functionality since ...Mario Vavti2016-02-272-0/+4
| |/
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2725-1160/+1170
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-266-57/+39
| |\
| | * fix link to photo album and make sure that small photos are not overwritten b...Mario Vavti2016-02-262-4/+4
| | * several photo item template fixesMario Vavti2016-02-263-19/+25
| | * some improvement for file activityMario Vavti2016-02-261-7/+8
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2016-02-264-6/+22
| | |\
| | * | get rid of duplicate functionMario Vavti2016-02-261-27/+2
| * | | turn timezone aware birthdays into a feature for those who want an uncluttere...redmatrix2016-02-265-1081/+1068
| * | | small improvements to profile like activityredmatrix2016-02-252-4/+10
| | |/ | |/|
| * | this reverts ea54987ca4c36redmatrix2016-02-251-1/+1
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-258-10/+18
| |\|
| | * revert f62ec4132ed571288737423de386054a4cc8b0d5 - allow one self to be added ...Mario Vavti2016-02-252-3/+3
| | * in update_birthdays() we should probably set adjust to 0 instead of 1 since a...Mario Vavti2016-02-251-1/+1
| | * provide an edit button for the profile pageMario Vavti2016-02-252-4/+8
| | * Merge pull request #299 from git-marijus/masterredmatrix2016-02-263-2/+6
| | |\
| | | * we have got a button for events in the nav. no need for it in the tabs if we ...Mario Vavti2016-02-253-2/+6
| | |/
| * / backtrace openssl_verify errors so that we can find bad keys - as there is ve...redmatrix2016-02-253-5/+21
| |/
| * when creating an event from a post in our stream, if the original post was pr...redmatrix2016-02-255-5/+16
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2528-63/+576
|\|
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-241-6/+6
| |\
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-02-259-9/+46
| | |\
| | * | another dutch updatejeroenpraat2016-02-251-6/+6
| * | | issue #216 - calendar sharingredmatrix2016-02-248-10/+425
| | |/ | |/|
| * | schema change to support channel move (a completely different operation than ...redmatrix2016-02-245-4/+23
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-244-9/+6
| |\|
| | * interim dutch string updatejeroenpraat2016-02-251-3/+3
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2016-02-251-5/+1
| | |\
| | | * fix boxy schemeMario Vavti2016-02-251-5/+1
| | * | fix TOSjeroenpraat2016-02-251-0/+1
| | |/
| | * give nav dropdowns a fixed width to preventtext-overflow: ellipsis cut of to ...Mario Vavti2016-02-241-1/+1
| * | add 'requires' field to plugin info to list other dependent plugins/addons an...redmatrix2016-02-244-5/+23
| |/
| * missing functionredmatrix2016-02-246-24/+26
| * function to process atom stream without actually storing anythingredmatrix2016-02-232-6/+68
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2016-02-2477-14152/+14543
|\|
| * Merge pull request #297 from bashrc/bashrc/commagit-marijus2016-02-231-1/+1
| |\
| | * Remove stray commaBob Mottram2016-02-231-1/+1
| |/
| * Merge pull request #296 from wave72/masterWave2016-02-232-1564/+1641
| |\
| | * Updated Italian stringsPaolo Tacconi2016-02-232-1564/+1641
| * | change wording in case where registration is by apprval onlyMario Vavti2016-02-231-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 22:25:59 +0000