Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | provide pref to set default photo resolution for posts to something other ↵ | friendica | 2015-01-23 | 1 | -0/+9 | |
| | | | | | | | | than 2. The only acceptable option is 1. (640) | |||||
* | | some code restructure | marijus | 2015-01-23 | 1 | -43/+55 | |
|/ | ||||||
* | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-22 | 2 | -2/+26 | |
|\ | ||||||
| * | add some mimetypes | marijus | 2015-01-22 | 2 | -2/+26 | |
| | | ||||||
* | | fix dir server query take 2 | Habeas Codice | 2015-01-22 | 1 | -1/+1 | |
|/ | | | | | rationale: use latest entry rather than latest update. update timestamp is updated for all entries upon success so they are equivalent. prevents dupes from fake null dates. | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-21 | 1 | -1/+2 | |
|\ | ||||||
| * | make $links an array of links | marijus | 2015-01-22 | 1 | -1/+2 | |
| | | ||||||
* | | zot_finger second arg is optional but function declaration didn't specify ↵ | friendica | 2015-01-21 | 1 | -1/+1 | |
|/ | | | | this - causes issue with check_upstream_directory | |||||
* | change mod/sharedwithme backend to use activity object - this is not ↵ | marijus | 2015-01-22 | 1 | -27/+76 | |
| | | | | backwards compatible | |||||
* | Rework directory server update selection query | Habeas Codice | 2015-01-20 | 1 | -1/+1 | |
| | ||||||
* | get rid of really old poco records once weekly | friendica | 2015-01-20 | 2 | -0/+9 | |
| | ||||||
* | poco rating variable getting over-written before local storage. | friendica | 2015-01-19 | 1 | -1/+1 | |
| | ||||||
* | Change link label from Feature settings to Feature/Addon settings to more ↵ | friendica | 2015-01-19 | 1 | -1/+1 | |
| | | | | accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true). | |||||
* | put cloud back in get_cloudpath - just have to be careful where we use it. | friendica | 2015-01-19 | 1 | -2/+4 | |
| | ||||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-18 | 1 | -5/+6 | |
|\ | ||||||
| * | fix postgres escaping | Habeas Codice | 2015-01-18 | 1 | -5/+6 | |
| | | ||||||
* | | typo | friendica | 2015-01-18 | 1 | -2/+2 | |
|/ | ||||||
* | remove all hardwired references to 'cloud' in the files interfaces and ↵ | friendica | 2015-01-18 | 2 | -9/+13 | |
| | | | | replace with $a->module. It's OK to leave them in the RedBrowser component because this will remain under /cloud. All the DAV bits need to be abstracted as they will eventually end up under /dav. $a->module will contain the correct string to use. | |||||
* | don't unset a directory server which has no active channels and hence will ↵ | friendica | 2015-01-18 | 1 | -9/+24 | |
| | | | | never have a site table update. Do this by probing the sys channel of that directory weekly and checking the directory status returned by it. | |||||
* | basic proof of concept file activity support - will send activity via the ↵ | marijus | 2015-01-18 | 4 | -4/+114 | |
| | | | | filestorage module and via attach_delete() | |||||
* | Merge pull request #856 from pafcu/master | pafcu | 2015-01-16 | 1 | -16/+13 | |
|\ | | | | | Fix some issues with tagging. | |||||
| * | Fix some issues with tagging. | Stefan Parviainen | 2015-01-16 | 1 | -16/+13 | |
| | | ||||||
* | | validate poco chatrooms before storing | friendica | 2015-01-15 | 1 | -0/+3 | |
| | | ||||||
* | | more heavy lifting on poco rep | friendica | 2015-01-15 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'pocorate' | friendica | 2015-01-15 | 1 | -2/+5 | |
|\ \ | ||||||
| * | | more backend work on poco rating | friendica | 2015-01-15 | 1 | -2/+5 | |
| |/ | ||||||
* / | backend for mailhost addon | friendica | 2015-01-15 | 1 | -0/+8 | |
|/ | ||||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-14 | 1 | -0/+4 | |
|\ | ||||||
| * | Merge pull request #850 from einervonvielen/toc | RedMatrix | 2015-01-15 | 1 | -0/+4 | |
| |\ | | | | | | | Added a table of content as bbcode element [toc] for webpages | |||||
| | * | Merge remote-tracking branch 'upstream/master' into toc | Einer von Vielen | 2015-01-14 | 4 | -56/+48 | |
| | |\ | ||||||
| | * | | Added a table of content as bbcode element [toc] for webpages | 2015-01-14 | 1 | -1/+1 | ||
| | | | | | | | | | | | | | | | | | | | | - Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0) - Modified jquery.toc.js to work with the webpages of the red#matrix - Added info to the help | |||||
| | * | | Test | Einer von Vielen | 2015-01-13 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | | ...with table of content. jquery.tableofconent.js works bunt not properly | |||||
* | | | | correct some activity object types (for comments), also fix a foreach ↵ | friendica | 2015-01-14 | 1 | -2/+7 | |
|/ / / | | | | | | | | | | warning resulting from recent tag work | |||||
* | | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and ↵ | friendica | 2015-01-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | turn it into a tag delimiter | |||||
* | | | federate consensus items (in network only). Work in progress. | friendica | 2015-01-14 | 1 | -0/+7 | |
| |/ |/| | ||||||
* | | check mentions against the appropriate xchan_url and not a hard-coded ↵ | friendica | 2015-01-13 | 1 | -4/+4 | |
| | | | | | | | | /channel/ string | |||||
* | | provide a setting to control ALLOWCODE permissions at the channel level - it ↵ | friendica | 2015-01-13 | 1 | -4/+4 | |
| | | | | | | | | isn't always appropriate to apply this to all channels in an account. | |||||
* | | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging | friendica | 2015-01-13 | 2 | -14/+2 | |
|\ \ | | | | | | | | | | | | | Conflicts: mod/profiles.php | |||||
| * | | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 2 | -14/+2 | |
| |/ | ||||||
* | | uninitialised theme parent in mod/cloud | friendica | 2015-01-12 | 1 | -1/+1 | |
| | | ||||||
* | | theme toggle issue when viewing mod/cloud of another channel | friendica | 2015-01-12 | 1 | -0/+9 | |
| | | ||||||
* | | don't wipe out the item body of a linked item to a photo when doing a normal ↵ | friendica | 2015-01-12 | 1 | -7/+18 | |
| | | | | | | | | delete and not forced | |||||
* | | change deletion behaviour of linked photo items. Previously deleting the ↵ | friendica | 2015-01-12 | 1 | -28/+12 | |
|/ | | | | 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. | |||||
* | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 2 | -0/+61 | |
| | ||||||
* | 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 | 3 | -27/+60 | |
| | ||||||
* | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 21 | -154/+169 | |
|\ | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js | |||||
| * | connection clone issues | friendica | 2015-01-10 | 1 | -0/+3 | |
| | | ||||||
| * | basic changes for file activity | marijus | 2015-01-09 | 2 | -1/+6 | |
| | |