aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * this reverts ea54987ca4c36redmatrix2016-02-251-1/+1
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-258-10/+18
| |\
| * | 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.
* | | get rid of duplicate functionMario Vavti2016-02-261-27/+2
| |/ |/|
* | 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.
* 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
| * Remove stray commaBob Mottram2016-02-231-1/+1
|/
* Merge pull request #296 from wave72/masterWave2016-02-232-1564/+1641
|\ | | | | Updated Italian strings
| * Updated Italian stringsPaolo Tacconi2016-02-232-1564/+1641
| |
* | change wording in case where registration is by apprval onlyMario Vavti2016-02-231-1/+1
| |
* | add salmon key paramredmatrix2016-02-222-1/+6
| |
* | pubsites: network column is not needed anymore (mentioned in intro text). ↵jeroenpraat2016-02-221-2/+2
| | | | | | | | Because of more vertical space Access and Register columnis separate again.
* | only hubs from local configured project on pubsites (hubzilla by default). ↵jeroenpraat2016-02-221-5/+2
| | | | | | | | as agreed with Mike.
* | change wordingMario Vavti2016-02-221-1/+1
| |
* | some work on mod/registerMario Vavti2016-02-228-226/+115
| |
* | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-215-7193/+7480
|\ \
| * | I don't think we need redmatrix hubs (or hubs without no project name) in ↵jeroenpraat2016-02-221-1/+6
| | | | | | | | | | | | this list. The other way around (hubzilla in redmatrix pubsites) is no problem I think. If not agreed, please revert.
| * | Merge pull request #290 from anaqreon/homeinstallredmatrix2016-02-222-8/+26
| |\ \ | | | | | | | | Added sendmail installation to .homeinstall script so that hub can se…
| | * | Renamed homeinstall config file and added check for required config ↵Andrew Manning2016-02-202-8/+20
| | | | | | | | | | | | | | | | parameters. Spelling corrections.
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzilla into homeinstallAndrew Manning2016-02-205-1337/+1411
| | |\ \
| | * | | Added sendmail installation to .homeinstall script so that hub can send ↵Andrew Manning2016-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | email notifications
| * | | | Merge pull request #291 from phellmes/de201602201300redmatrix2016-02-222-7184/+7448
| |\ \ \ \ | | | | | | | | | | | | Update DE strings
| | * | | | Update DE stringsphellmes2016-02-202-7184/+7448
| | | | | |
* | | | | | remove bookmark identifier from embedded links since they aren't ↵redmatrix2016-02-211-1/+1
|/ / / / / | | | | | | | | | | | | | | | bookmarkable without an associated taxonomy entry.
* | | | | retry the move of AccessList to composer format (one or more third-party ↵redmatrix2016-02-2116-80/+83
| | | | | | | | | | | | | | | | | | | | plugins will likely break as a result)
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2016-02-2111-3169/+3348
|\ \ \ \ \
| * | | | | There was nothing wrong with my pimped pubsites (was another problem). Took ↵jeroenpraat2016-02-218-3152/+3342
| | | | | | | | | | | | | | | | | | | | | | | | the opportunity to update schemas. Plus updated spanish and dutch strings.
| * | | | | Revert pubsites.php. There seems something wrong. Let me troubleshoot that ↵jeroenpraat2016-02-211-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | first.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 22:36:36 +0000