aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-18429-98157/+8997
|\
| * update smarty to 3.1.28 stableMario Vavti2015-12-1814-197/+173
| |
| * loop detectionredmatrix2015-12-172-5/+12
| |
| * more work on media uploads via apiredmatrix2015-12-172-9/+27
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-1711-104/+116
| |\
| | * fix search item attachment renderingMario Vavti2015-12-171-5/+6
| | |
| | * Merge pull request #227 from zzottel/masterzzottel2015-12-174-0/+87
| | |\ | | | | | | | | add forgotten German docs
| | | * Merge remote-tracking branch 'upstream/master'zottel2015-12-170-0/+0
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #226 from zzottel/masterzzottel2015-12-176-99/+23
| | |\ \ | | | | | | | | | | help files
| | | | * add forgotten German docszottel2015-12-174-0/+87
| | | |/
| | | * small fixes to English docszottel2015-12-173-7/+6
| | | |
| | | * reorganize German docs to fit the new docs structurezottel2015-12-173-92/+17
| | |/ | | | | | | | | | fix mentions of RedMatrix
| * / issue #228redmatrix2015-12-172-3/+3
| |/
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-166-58/+75
| |\
| | * Merge pull request #225 from zzottel/masterredmatrix2015-12-176-58/+75
| | |\ | | | | | | | | help files
| | | * small fixes in English help fileszottel2015-12-163-5/+5
| | | |
| | | * updates to some German help fileszottel2015-12-163-53/+70
| | | |
| * | | queue/notification/delivery refactor continuedredmatrix2015-12-165-241/+119
| |/ /
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-165-7953/+8255
| |\|
| | * Merge pull request #224 from zzottel/masterzzottel2015-12-162-6969/+7218
| | |\ | | | | | | | | update to German strings
| | | * update to German stringszottel2015-12-162-6969/+7218
| | |/
| | * Merge pull request #223 from zzottel/masterzzottel2015-12-161-1/+1
| | |\ | | | | | | | | remove directory red.zottel.red, add hubzilla.zottel.net instead
| | | * remove directory fallback server red.zottel.red, add hubzilla.zottel.net insteadzottel2015-12-161-1/+1
| | | |
| | * | Merge pull request #222 from wave72/masterWave2015-12-162-983/+1036
| | |\ \ | | | |/ | | |/| Updated Italian strings
| | | * Updated Italian stringsPaolo Tacconi2015-12-162-983/+1036
| | | |
| * | | some notifier optimisations. Also put a fixme on the invite total ↵redmatrix2015-12-163-27/+21
| |/ / | | | | | | | | | generations for new accounts, which is incorrect and now commented out.
| * | some more minor api tweaksredmatrix2015-12-151-5/+9
| | |
| * | bring back the schemaspy makefileredmatrix2015-12-151-0/+17
| | |
| * | remove deprecated tableredmatrix2015-12-156-39/+2
| | |
| * | additional fix for the array_key_exists message in #221redmatrix2015-12-151-1/+1
| | |
| * | issue #221redmatrix2015-12-15374-89385/+31
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-153-2/+9
| |\ \
| | * | Invitation only added to the admin site page. Plus css wrapper class to docu ↵jeroenpraat2015-12-153-2/+9
| | | | | | | | | | | | | | | | search.
| * | | enhance whitespaceredmatrix2015-12-151-1/+1
| | | |
| * | | fix typos before mergingredmatrix2015-12-151-1/+1
| | | |
| * | | revise the photo activity a bit so that we always have a valid activity ↵redmatrix2015-12-154-50/+53
| |/ / | | | | | | | | | body. Several network connectors can get empty posts or posts that don't contain any reference whatsoever to the actual photo. Since this can cause duplicate images on our own site, just provide the activity summary and any included body text to the activity by default. Provide a function to enhance this activity with an actual photo which can be applied on demand for any network connectors that desire it. Otherwise they'll just get a link to the photo in the activity statement - which is better than an empty post. Have applied this "add actual photo to the post" function to both Diaspora and RSS feeds. Also provide the album as the activity target.
| * | even more queue apiredmatrix2015-12-151-15/+7
| | |
| * | more queue apiredmatrix2015-12-154-30/+29
| | |
| * | more work on queue apiredmatrix2015-12-144-67/+45
| | |
| * | simplify queue insertion for normal itemsredmatrix2015-12-142-39/+44
| | |
| * | regenerate the item body for linked photo items that now have no body to ↵redmatrix2015-12-142-0/+22
| | | | | | | | | | | | provide legal activities when going to other networks. Remove the signature since the signed text was an empty string and we've just replaced it with content that will not verify.
| * | set following to falseredmatrix2015-12-141-1/+1
| | |
* | | Commented out extra addons, themes etc.Haakon Meland Eriksen2015-12-181-9/+9
| | |
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-1451-3337/+3139
|\| |
| * | revert include/photos.php:L380redmatrix2015-12-142-2/+2
| | |
| * | more work on api media uploadsredmatrix2015-12-134-20/+37
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-135-1518/+1511
| |\ \
| | * | Typosjeroenpraat2015-12-121-1/+1
| | | |
| | * | That script is taken from someone else without any contribution ↵jeroenpraat2015-12-121-14/+3
| | | | | | | | | | | | | | | | (http://blog.strictly-software.com/2013/07/apache-performance-tuning-bash-script.html). Also the English is very bad. Anyway, I've replaced it with some general tips that all web admins should know.
| | * | Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2015-12-123-2/+28
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 16:57:33 +0000