aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update es-es. tested it and it works now. Don't know what happened earlier.jeroenpraat2016-02-292-1342/+1326
|
* fix deletion of files from filesystemMario Vavti2016-02-291-1/+1
|
* do not process update activity if there is no item to update and simplify ↵Mario Vavti2016-02-291-28/+19
| | | | code a little
* revert es-es update. something went wrong. later today I will examine what.jeroenpraat2016-02-292-84/+9767
|
* build_sync_packet - no need to sleep after the last sync delivery.redmatrix2016-02-281-1/+5
|
* stop the PHP warnings from Thomas's buggered sitekeyredmatrix2016-02-281-1/+1
|
* Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-282-9767/+84
|\
| * update es-es stringsjeroenpraat2016-02-282-9767/+84
| |
* | revupredmatrix2016-02-281-1/+1
|/
* I haven't investigated 'why', but the addition of the router class in ↵redmatrix2016-02-271-0/+3
| | | | https://github.com/redmatrix/hubzilla/commit/1db3409f36f408bfc49816e1fab3df4b53b8f19e resulted in the setup global variable $install_wizard_pass to not get initiated at the global level when the setup module file was included. This corrects the situation and makes install work but without explaining why the variable wasn't instantiated in the first place. This may be important - if any other modules use global variables internally. I don't believe that any do, but the behaviour needs to be resolved or documented.
* 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 strings
| | * Update DE translation stringsphellmes2016-02-272-1342/+1326
| | |
| * | 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
| | | | | | | | this is not supported by the backend at the moment.
* | z_fetch_url and z_post_url returning falseredmatrix2016-02-272-3/+3
|/
* 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 ↵Mario Vavti2016-02-262-4/+4
| | | | | | | | by body text.
| * 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 ↵redmatrix2016-02-265-1081/+1068
| | | | | | | | | | | | uncluttered calendar - at the expense of possibly sending somebody's birthday greeting on the wrong day if they are in a different timezone.
* | | 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
| | | | | | | | to a privacy group.
| * in update_birthdays() we should probably set adjust to 0 instead of 1 since ↵Mario Vavti2016-02-251-1/+1
| | | | | | | | a birthday is more a kind of a global holiday
| * 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 tab…
| | * 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
| |/ | | | | | | are local.
* / backtrace openssl_verify errors so that we can find bad keys - as there is ↵redmatrix2016-02-253-5/+21
|/ | | | very little relevant context available at this level.
* when creating an event from a post in our stream, if the original post was ↵redmatrix2016-02-255-5/+16
| | | | private, set the event permissions to "just me". If it was a public event, set the event permissions to the channel default permissions.
* 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
| | | | | | | | channel clone)
* | 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
| | | | | | | | much of the text in some situations
* | add 'requires' field to plugin info to list other dependent plugins/addons ↵redmatrix2016-02-244-5/+23
|/ | | | and disable if dependencies are not installed/enabled
* missing functionredmatrix2016-02-246-24/+26
|
* function to process atom stream without actually storing anythingredmatrix2016-02-232-6/+68
|
* Merge pull request #297 from bashrc/bashrc/commagit-marijus2016-02-231-1/+1
|\ | | | | Remove stray comma