aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #856 from pafcu/masterpafcu2015-01-161-16/+13
|\
| * Fix some issues with tagging.Stefan Parviainen2015-01-161-16/+13
* | validate poco chatrooms before storingfriendica2015-01-151-0/+3
* | more heavy lifting on poco repfriendica2015-01-151-0/+1
* | Merge branch 'pocorate'friendica2015-01-151-2/+5
|\ \
| * | more backend work on poco ratingfriendica2015-01-151-2/+5
| |/
* / backend for mailhost addonfriendica2015-01-151-0/+8
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-141-0/+4
|\
| * Merge pull request #850 from einervonvielen/tocRedMatrix2015-01-151-0/+4
| |\
| | * 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
| | * | TestEiner von Vielen2015-01-131-0/+4
* | | | correct some activity object types (for comments), also fix a foreach warning...friendica2015-01-141-2/+7
|/ / /
* | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and tur...friendica2015-01-141-2/+2
* | | 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 /channe...friendica2015-01-131-4/+4
* | provide a setting to control ALLOWCODE permissions at the channel level - it ...friendica2015-01-131-4/+4
* | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-132-14/+2
|\ \
| * | 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
* | change deletion behaviour of linked photo items. Previously deleting the visi...friendica2015-01-121-28/+12
|/
* 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
* 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
|\
| * 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
| |/
| * detect https coming through reverse proxy or load balancer using x-forwarded-...friendica2015-01-051-0/+2
| * 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
| * Revert "Language names via intl library."RedMatrix2014-12-312-25/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 11:09:55 +0000