| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | change deletion behaviour of linked photo items. Previously deleting the ↵ | friendica | 2015-01-12 | 2 | -29/+13 | |
| | |/ / / |/| | | | | | | | | | | | visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time. | |||||
| * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-12 | 6 | -116/+98 | |
| |\ \ \ \ | ||||||
| | * | | | | Merge pull request #844 from pafcu/moretagging | pafcu | 2015-01-12 | 5 | -116/+96 | |
| | |\| | | | | | | | | | | | | | Refactor mention code to make it more reusable | |||||
| | | * | | | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 5 | -116/+96 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #842 from pafcu/master | pafcu | 2015-01-12 | 1 | -0/+2 | |
| | |\| | | | | | | | | | | | | | Possibly fix issue with readmore.js collapse | |||||
| | | * | | | Possibly fix issue with readmore.js collapse | Stefan Parviainen | 2015-01-12 | 1 | -0/+2 | |
| | |/ / / | ||||||
| * / / / | double perms msg | friendica | 2015-01-12 | 2 | -2/+2 | |
| |/ / / | ||||||
| * | | | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 4 | -18/+46 | |
| | | | | ||||||
| * | | | remove extraneous debug file left over from postgres work. | friendica | 2015-01-11 | 1 | -1/+0 | |
| | | | | ||||||
| * | | | that was not intended to be merged with master yet. Put it under a define | friendica | 2015-01-11 | 1 | -2/+36 | |
| | | | | ||||||
| * | | | optionally use openssl encryption functions (higher performance over mcrypt, ↵ | friendica | 2015-01-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | but potentially more likely to have been compromised) | |||||
| * | | | allow the use of openssl crypto | friendica | 2015-01-11 | 1 | -0/+6 | |
| | | | | ||||||
| * | | | basic backend work for creating consensus items | friendica | 2015-01-11 | 5 | -27/+84 | |
| | | | | ||||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-11 | 12 | -153/+33 | |
| |\ \ \ | ||||||
| | * \ \ | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-11 | 11 | -152/+32 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge pull request #840 from cvogeley/master | RedMatrix | 2015-01-12 | 11 | -152/+32 | |
| | | |\ \ \ | | | | | | | | | | | | | Fix for #Issue763 | |||||
| | | | * | | | Correction | Christian Vogeley | 2015-01-11 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | | * | | | Correction | Christian Vogeley | 2015-01-11 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | | * | | | Correction | Christian Vogeley | 2015-01-11 | 3 | -4/+3 | |
| | | | | | | | ||||||
| | | | * | | | corrcetion | Christian Vogeley | 2015-01-11 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | | * | | | Correct | Christian Vogeley | 2015-01-11 | 1 | -19/+18 | |
| | | | | | | | ||||||
| | | | * | | | Revert "put back in" | Christian Vogeley | 2015-01-11 | 1 | -18/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5beec923b462cbb6a4653b5387998787ed8f45b7. | |||||
| | | | * | | | Revert "put back in" | Christian Vogeley | 2015-01-11 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ab07857d9c8762fb00998761866262e012bab791. | |||||
| | | | * | | | put back in | Christian Vogeley | 2015-01-11 | 1 | -0/+4 | |
| | | | | | | | ||||||
| | | | * | | | put back in | Christian Vogeley | 2015-01-11 | 1 | -0/+18 | |
| | | | | | | | ||||||
| | | | * | | | . | Christian Vogeley | 2015-01-11 | 1 | -0/+131 | |
| | | | | | | | ||||||
| | | | * | | | . | Christian Vogeley | 2015-01-11 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | | * | | | fix accidentally removed file | Christian Vogeley | 2015-01-11 | 1 | -0/+446 | |
| | | | | | | | ||||||
| | | | * | | | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 1714 | -40293/+538358 | |
| | | | |\ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js | |||||
| | | | * | | | Fix for issue #763 Error creating new channel within the limits of the | Christian Vogeley | 2015-01-11 | 3 | -2/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | subscription plan | |||||
| | | | * | | | merge | Christian Vogeley | 2014-12-27 | 7 | -757/+18 | |
| | | | | | | | ||||||
| | * | | | | | revup | friendica | 2015-01-11 | 1 | -1/+1 | |
| | |/ / / / | ||||||
| * | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-10 | 2 | -2/+5 | |
| |\| | | | | ||||||
| | * | | | | connection clone issues | friendica | 2015-01-10 | 2 | -2/+5 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-10 | 58 | -6617/+7131 | |
| |\| | | | | ||||||
| | * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-10 | 11 | -5411/+5452 | |
| | |\ \ \ \ | ||||||
| | | * \ \ \ | Merge pull request #839 from einervonvielen/dev_beginning_fix1 | RedMatrix | 2015-01-11 | 1 | -17/+25 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Fixed / Changed step-by-step manual for beginning developers | |||||
| | | | * | | | | Changed step-by-step manual for beginning developers. | Einer von Vielen | 2015-01-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed: Deleted wrong "orign" in push - Changed: Spellings - Added: Eclipses GIT plugin "Eclipse Mylyn to GitHub connector" | |||||
| | | | * | | | | Changed step-by-step manual for beginning devolopers. | Einer von Vielen | 2015-01-10 | 1 | -17/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed: Deleted "origin" in push at the end of the document - Changed: Wordings - Added: Reference to eclipse GIT plugin "Eclipse Mylyn to GitHub connector" | |||||
| | | * | | | | | Fix unescaped image data | Habeas Codice | 2015-01-10 | 1 | -0/+1 | |
| | | |/ / / / | ||||||
| | | * | | | | Merge pull request #838 from f03el/master | git-marijus | 2015-01-10 | 3 | -2696/+2709 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Some updates to the Swedish translation | |||||
| | | | * | | | | Fix typo and rephrase Swedish translation | Erik Lundin | 2015-01-10 | 1 | -5/+5 | |
| | | | | | | | | ||||||
| | | | * | | | | Update Swedish strings from Transifex | Erik Lundin | 2015-01-10 | 2 | -2691/+2704 | |
| | | | | | | | | ||||||
| | | * | | | | | Merge pull request #837 from git-marijus/master | git-marijus | 2015-01-10 | 4 | -2/+8 | |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | basic changes for file activity | |||||
| | | | * | | | | basic changes for file activity | marijus | 2015-01-09 | 4 | -2/+8 | |
| | | |/ / / / | ||||||
| | | * | | | | Merge pull request #836 from tuscanhobbit/dev | Paolo T | 2015-01-09 | 2 | -2696/+2709 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Updated Italian translation | |||||
| | | | * | | | | Updated Italian translation | Paolo Tacconi | 2015-01-09 | 2 | -2696/+2709 | |
| | | |/ / / / | ||||||
| | * / / / / | doc updates | friendica | 2015-01-10 | 47 | -1206/+1679 | |
| | |/ / / / | ||||||
| * | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-08 | 1 | -1/+3 | |
| |\| | | | | ||||||
| | * | | | | clean up some url anomalies in dir_sort_links after security fix | friendica | 2015-01-08 | 1 | -1/+3 | |
| | | | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |