aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-301-1/+1
|\
| * better cross-browser compatibility for td hover colourmarijus2015-01-301-1/+1
* | let zot_refresh continue without a primary hub if one cannot be found. also w...friendica2015-01-3086-4189/+4483
|/
* Merge pull request #881 from cvogeley/masterRedMatrix2015-01-302-1/+5
|\
| * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-292-1/+5
* | how did that stuff merge? grrrr....friendica2015-01-292-3/+3
* | bring back inline imagesfriendica2015-01-291-6/+15
* | enable ratings only in this branch until we're ready to pushfriendica2015-01-291-1/+1
* | Merge branch 'master' into pocoratefriendica2015-01-295-6/+5
|\ \
| * \ Merge https://github.com/friendica/red into pending_mergefriendica2015-01-294-6/+4
| |\ \
| | * \ Merge pull request #880 from redswede/masterRedMatrix2015-01-304-6/+4
| | |\ \ | | | |/ | | |/|
| | | * small autocomplete fix adding space to the outputRedSwede2015-01-291-1/+1
| | | * non-tested fix for issue 847RedSwede2015-01-291-1/+1
| | | * fix issue 848 + code commentsRedSwede2015-01-291-4/+2
| | | * Renamed translation fileRedSwede2015-01-291-0/+0
| | |/
| * / disable ratings until we're a bit further along. It's all changing.friendica2015-01-291-0/+1
| |/
* | Merge branch 'master' into pocoratefriendica2015-01-29165-936/+933
|\|
| * implement diaspora profile message (oops) or updated profile photos won't be ...friendica2015-01-292-22/+5
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-284-5/+7
| |\
| | * postgres does not support the , syntax. a ; would work, if it weren't stateme...Habeas Codice2015-01-281-1/+3
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-2827-388/+604
| | |\
| | * | bookmarkedchats: remove extraneous group by, dupes removed on insertHabeas Codice2015-01-281-2/+2
| | * | fix improper group by usageHabeas Codice2015-01-281-1/+1
| | * | fix implicit booleanHabeas Codice2015-01-281-1/+1
| * | | provide compatibility functions so code breakage with customised setups or wo...friendica2015-01-281-0/+12
| * | | remote_user => remote_channelfriendica2015-01-2833-47/+47
| * | | local_user => local_channelfriendica2015-01-28155-886/+886
| | |/ | |/|
* | | prate modulefriendica2015-01-291-0/+91
* | | basic query for number of raters. Should probably be a join or subselect but ...friendica2015-01-281-1/+11
* | | updates to put rating info into the local xlink before sending it to known di...friendica2015-01-282-2/+48
* | | Merge branch 'master' into pocoratefriendica2015-01-289-21/+75
|\| |
| * | make sure we honour the disable_discover_tab preffriendica2015-01-281-1/+5
| * | allow diaspora posts to be delivered to the discover channel unless prohibite...friendica2015-01-281-1/+5
| * | limit the number of forums that can be tagged in a single post - default is 2...friendica2015-01-281-8/+46
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-4/+2
| |\ \
| | * | fix /view/de/lostpass_eml.tplmarijus2015-01-281-4/+2
| * | | Revert "issue with de email template (lostpass_eml.tpl)"friendica2015-01-281-1/+1
| * | | issue with de email template (lostpass_eml.tpl)friendica2015-01-281-1/+1
| |/ /
| * | add yet another firehose checkfriendica2015-01-281-1/+1
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-283-2/+5
| |\ \
| | * | show shared button only to local usermarijus2015-01-282-1/+4
| | * | no need for new line here - spacing is done via cssmarijus2015-01-281-1/+1
| * | | more minor tweaks to the route mismatch algorithm after watching it all day.friendica2015-01-282-3/+6
| |/ /
| * | allow RSS connections in the type 'a' autocomplete results as that is used fo...friendica2015-01-271-3/+7
| * | ignore route mismatches on firehose posts to the sys channel. Use whatever pa...friendica2015-01-271-1/+1
| * | we need to actually ask for the id from the DB if we want to use it.friendica2015-01-271-1/+1
* | | first cut at direntry template, right now just provide a mockup with a slider...friendica2015-01-271-0/+12
|/ /
* | improved route mismatch detection. We will be less strict about the absolute ...friendica2015-01-272-35/+42
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-276-102/+154
|\ \
| * | tpl and css cleanupmarijus2015-01-272-12/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 06:03:53 +0000