aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* updating the local item only does not make much sense in this caseMario Vavti2015-10-141-2/+1
|
* wrong variableMario Vavti2015-10-141-1/+1
|
* Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-145-4196/+4174
|\
| * issue #82 - args not defined (should be arr)redmatrix2015-10-141-1/+1
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-144-630/+656
| |\
| * | port of mail encodingredmatrix2015-10-141-8/+8
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-144-4195/+4173
| |\ \
| | * \ Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-141-4193/+4122
| | |\ \
| | | * | Regenerated messages.po.jeroenpraat2015-10-141-4193/+4122
| | | | |
| | * | | support for mail syncredmatrix2015-10-143-2/+51
| | |/ /
* | | | remove $item from $prep_arr - we probably do not need itMario Vavti2015-10-141-1/+1
| | | |
* | | | really check for large photos featureMario Vavti2015-10-142-2/+2
| | | |
* | | | allow photo-items to appear full width if large photos feature is enabled. ↵Mario Vavti2015-10-1412-153/+179
| |_|/ |/| | | | | | | | in prepare_body() split off mentions, tags, categories folders and attachments from body for easier theming. some other little fixes.
* | | Merge pull request #80 from git-marijus/masterredmatrix2015-10-142-3/+3
|\ \ \ | | | | | | | | fix /channel not updating after posting comment
| * | | fix photo visibility switch on photo uploadMario Vavti2015-10-131-2/+2
| | | |
| * | | fix /channel not updating after posting commentMario Vavti2015-10-131-1/+1
| | | |
* | | | Merge pull request #81 from tuscanhobbit/masterWave2015-10-142-627/+653
|\ \ \ \ | |_|/ / |/| | | Italian strings updated
| * | | Italian strings updatedPaolo Tacconi2015-10-142-627/+653
| | | |
* | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-131-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | do not collapse content which is just slightly higher than we allowMario Vavti2015-10-131-0/+1
| | | |
* | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-132-4/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: include/api.php
| * | | api extenesions for file migrationredmatrix2015-10-132-5/+6
| | | |
* | | | file migration - continuedredmatrix2015-10-131-4/+29
| |/ / |/| |
* | | port of file detail api callredmatrix2015-10-121-3/+1
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-121-0/+24
|\| |
| * | file detail api call (will not work for huge files)redmatrix2015-10-121-0/+24
| | |
* | | missing underscoreredmatrix2015-10-121-1/+1
| | |
* | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-122-2/+10
|\| | | | | | | | | | | | | | Conflicts: include/attach.php
| * | attach_list_files had some problems - wasn't used until now apparentlyredmatrix2015-10-122-2/+10
| | |
* | | small change to allow a person with sufficient privileges the ability to ↵redmatrix2015-10-121-3/+12
| | | | | | | | | | | | import a file into their cloud storage from elsewhere in the server filesystem - without nuking it in the process.
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-1214-923/+1021
|\ \ \
| * | | update es + nl stringsjeroenpraat2015-10-134-846/+854
| | | |
| * | | Merge pull request #79 from HaakonME/masterredmatrix2015-10-123-2/+92
| |\ \ \ | | | | | | | | | | Updated Help pages to include Hubzilla on OpenShift
| | * | | Updated Hubzilla on OpenShift HOWTO with use of loggingHaakon Meland Eriksen2015-10-112-0/+16
| | | | |
| | * | | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-0/+1
| | | | |
| | * | | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-1/+1
| | | | |
| | * | | Updated README for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-2/+2
| | | | |
| | * | | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-1/+1
| | | | |
| | * | | Updated help page for Hubzilla on OpenShiftHaakon Meland Eriksen2015-10-101-7/+9
| | | | |
| | * | | Added link to Hubzilla on OpenShift HOWTO using ProjectnameHaakon Meland Eriksen2015-10-101-1/+1
| | | | |
| | * | | Added link to Hubzilla on OpenShift HOWTOHaakon Meland Eriksen2015-10-101-0/+1
| | | | |
| | * | | Hubzilla on OpenShift HOWTO added to HelpHaakon Meland Eriksen2015-10-101-0/+70
| | | | |
| * | | | another collapseHeight() fixMario Vavti2015-10-111-1/+1
| | | | |
| * | | | fix an issue with collapseHeight() and css margins/paddings in directoryMario Vavti2015-10-111-0/+3
| | | | |
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-10-111-1/+1
| |\ \ \ \
| * | | | | some conv-item restructuring to allow full width elementsMario Vavti2015-10-115-74/+71
| | | | | |
* | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-10-121-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | version rollredmatrix2015-10-121-1/+1
| | | | |
* | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-10-114-4/+85
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Added Hubzilla banner to the Readme (for Github)jeroenpraat2015-10-112-2/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 12:03:01 +0000