aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Fix some issues with tagging.Stefan Parviainen2015-01-161-16/+13
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-141-0/+4
|\
| * Merge pull request #850 from einervonvielen/tocRedMatrix2015-01-151-0/+4
| |\ | | | | | | Added a table of content as bbcode element [toc] for webpages
| | * Merge remote-tracking branch 'upstream/master' into tocEiner von Vielen2015-01-144-56/+48
| | |\
| | * | Added a table of content as bbcode element [toc] for webpages2015-01-141-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
| | * | TestEiner von Vielen2015-01-131-0/+4
| | | | | | | | | | | | | | | | ...with table of content. jquery.tableofconent.js works bunt not properly
* | | | correct some activity object types (for comments), also fix a foreach ↵friendica2015-01-141-2/+7
|/ / / | | | | | | | | | warning resulting from recent tag work
* | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and ↵friendica2015-01-141-2/+2
| | | | | | | | | | | | turn it into a tag delimiter
* | | federate consensus items (in network only). Work in progress.friendica2015-01-141-0/+7
| |/ |/|
* | check mentions against the appropriate xchan_url and not a hard-coded ↵friendica2015-01-131-4/+4
| | | | | | | | /channel/ string
* | provide a setting to control ALLOWCODE permissions at the channel level - it ↵friendica2015-01-131-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-moretaggingfriendica2015-01-132-14/+2
|\ \ | | | | | | | | | | | | Conflicts: mod/profiles.php
| * | Allow tags in mail, many profile fields, and admin infoStefan Parviainen2015-01-132-14/+2
| |/
* | uninitialised theme parent in mod/cloudfriendica2015-01-121-1/+1
| |
* | theme toggle issue when viewing mod/cloud of another channelfriendica2015-01-121-0/+9
| |
* | don't wipe out the item body of a linked item to a photo when doing a normal ↵friendica2015-01-121-7/+18
| | | | | | | | delete and not forced
* | change deletion behaviour of linked photo items. Previously deleting the ↵friendica2015-01-121-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 reusableStefan Parviainen2015-01-122-0/+61
|
* optionally use openssl encryption functions (higher performance over mcrypt, ↵friendica2015-01-111-2/+2
| | | | but potentially more likely to have been compromised)
* allow the use of openssl cryptofriendica2015-01-111-0/+6
|
* basic backend work for creating consensus itemsfriendica2015-01-113-27/+60
|
* Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-1121-154/+169
|\ | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js
| * connection clone issuesfriendica2015-01-101-0/+3
| |
| * basic changes for file activitymarijus2015-01-092-1/+6
| |
| * clean up some url anomalies in dir_sort_links after security fixfriendica2015-01-081-1/+3
| |
| * double q argument could also cause issuesfriendica2015-01-081-1/+4
| |
| * SECURITY: dir_sort_links() exposes session cookiefriendica2015-01-081-2/+2
| |
| * include channel clones in PM deliveries (also some whitespace edits)friendica2015-01-083-16/+17
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-071-9/+1
| |\
| | * Merge autocomplete caching, show more results in navbar searchStefan Parviainen2015-01-074-42/+56
| | |\
| | * | Make nav search use textcompleteStefan Parviainen2015-01-071-9/+1
| | | |
| * | | syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-071-0/+2
| | |/ | |/|
| * | don't update locally deleted itemsfriendica2015-01-061-3/+8
| | |
| * | don't let dns_get_record() "write to screen" if it errors.friendica2015-01-061-2/+2
| | |
| * | lines reversed in handle_tag()friendica2015-01-061-2/+2
| | |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-061-1/+1
| |\|
| | * Add title to bb_observer tags to further clarify a bit what's going onStefan Parviainen2015-01-061-1/+1
| | |
| * | regression: need float clear on manage page so footer doesn't end up floated,friendica2015-01-051-35/+44
| |/ | | | | | | add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this.
| * detect https coming through reverse proxy or load balancer using ↵friendica2015-01-051-0/+2
| | | | | | | | x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled
| * Replace jslider with jRangeStefan Parviainen2015-01-051-1/+1
| |
| * Use grouped select field for role selectionStefan Parviainen2015-01-011-29/+9
| |
| * Use grouped select field for timezone selectionStefan Parviainen2015-01-011-38/+9
| |
| * Revert "Revert "Language names via intl library.""Stefan Parviainen2014-12-312-7/+25
| | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094.
| * Revert "Language names via intl library."RedMatrix2014-12-312-25/+7
| |
| * Merge pull request #796 from pafcu/profeditfixRedMatrix2014-12-311-1/+4
| |\ | | | | | | Don't show links to edit alternate profiles if multi_profiles is disable...
| | * Don't show links to edit alternate profiles if multi_profiles is disabledStefan Parviainen2014-12-301-1/+4
| | |
| * | Merge pull request #794 from pafcu/langRedMatrix2014-12-312-7/+25
| |\ \ | | | | | | | | Language names via intl library.
| | * | Update function doc, return language code if language is not recognizedStefan Parviainen2014-12-301-3/+7
| | | |
| | * | Language names via intl library. Fixes #773Stefan Parviainen2014-12-302-5/+19
| | |/
| * | Merge pull request #791 from pafcu/notificationsRedMatrix2014-12-311-2/+15
| |\ \ | | | | | | | | Improved notifications