| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | theme toggle issue when viewing mod/cloud of another channel | friendica | 2015-01-12 | 2 | -18/+0 |
| | | |||||
| * | document the pros and cons of the not-yet written hassle-free connection ↵ | friendica | 2015-01-12 | 1 | -0/+9 |
| | | | | | auto-permission setting. | ||||
| * | change deletion behaviour of linked photo items. Previously deleting the ↵ | friendica | 2015-01-12 | 1 | -1/+1 |
| | | | | | 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 | 2 | -115/+34 |
| |\ | |||||
| | * | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 2 | -115/+34 |
| | | | |||||
| * | | double perms msg | friendica | 2015-01-12 | 1 | -1/+1 |
| |/ | |||||
| * | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 1 | -4/+4 |
| | | |||||
| * | 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 |
| | | |||||
| * | basic backend work for creating consensus items | friendica | 2015-01-11 | 1 | -0/+20 |
| | | |||||
| * | Merge branch 'master' into trinidad | friendica | 2015-01-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 18 | -205/+253 |
| | |\ | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | subscription plan | ||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-10 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | connection clone issues | friendica | 2015-01-10 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-10 | 2 | -1/+2 |
| |\| | | |||||
| | * | | Fix unescaped image data | Habeas Codice | 2015-01-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | basic changes for file activity | marijus | 2015-01-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-08 | 2 | -23/+28 |
| |\| | | |||||
| | * | | Merge pull request #833 from pafcu/oneautocompleter | pafcu | 2015-01-08 | 2 | -23/+28 |
| | |\ \ | | | | | | | | | Fixes for the new autocompletion | ||||
| | | * | | Fix saved searches on network page, fix caching mith multiple autocompleters | Stefan Parviainen | 2015-01-08 | 1 | -22/+26 |
| | | | | | |||||
| | | * | | Honor requested count in navbar search | Stefan Parviainen | 2015-01-08 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into trinidad | friendica | 2015-01-07 | 4 | -42/+22 |
| |\| | | | |||||
| | * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-07 | 1 | -34/+14 |
| | |\| | | |||||
| | | * | | Return results from acl.php in standard form | Stefan Parviainen | 2015-01-07 | 1 | -20/+0 |
| | | | | | |||||
| | | * | | Make nav search use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -14/+14 |
| | | | | | |||||
| | * | | | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 2 | -6/+6 |
| | | | | | |||||
| | * | | | don't allow admin to delete the sys channel from the channel manage page | friendica | 2015-01-06 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | begin the grand unification for 3.0. Start by splitting DAV into a web ↵ | friendica | 2015-01-06 | 2 | -27/+156 |
| | | | | | | | | | | | | | accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources. | ||||
| * | | | undo these bits of trinidad - we're going to do things differently | friendica | 2015-01-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+1 |
| |\| | | |||||
| | * | | the last checkin removed hostname from the address for autocomplete ↵ | friendica | 2015-01-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn. | ||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+1 |
| |\| | | |||||
| | * | | only check the LHS of xchan_addr for autocomplete, don't match on the hostname. | friendica | 2015-01-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 2 | -76/+73 |
| |\| | | |||||
| | * | | Merge pull request #816 from pafcu/acl | RedMatrix | 2015-01-05 | 1 | -75/+72 |
| | |\ \ | | | | | | | | | Autocomplete improvements | ||||
| | | * | | Typo | Stefan Parviainen | 2015-01-04 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Sorting of autocomplete | Stefan Parviainen | 2015-01-04 | 4 | -21/+56 |
| | | |\ \ | |||||
| | | * | | | Autocmplete suggestions for non-local users, also suggest from visited ↵ | Stefan Parviainen | 2015-01-04 | 1 | -75/+52 |
| | | | | | | | | | | | | | | | | | | | | | channel's connections | ||||
| | * | | | | Fix wrong require | Stefan Parviainen | 2015-01-04 | 1 | -1/+1 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+3 |
| |\| | | | |||||
| | * | | | provide some info for buttons | marijus | 2015-01-03 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 1 | -9/+11 |
| |\| | | | |||||
| | * | | | some work on the edit connection workflow explanation and connedit page. ↵ | friendica | 2015-01-02 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | | This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. | ||||
| * | | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 1 | -2/+5 |
| |\| | | | |||||
| | * | | | Merge pull request #810 from pafcu/aclsort | pafcu | 2015-01-02 | 1 | -2/+5 |
| | |\ \ \ | | | | | | | | | | | Sort acl results according to match position (only type='c' for now) | ||||
| | | * | | | Sort acl results according to match position (only type='c' for now) | Stefan Parviainen | 2015-01-02 | 1 | -2/+5 |
| | | |/ / | |||||
| * | | | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 1 | -7/+15 |
| |\| | | | |||||
| | * | | | syntax issues (with some php versions?), unchecked intval | friendica | 2015-01-01 | 1 | -7/+15 |
| | |/ / | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 5 | -28/+30 |
| |\| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |