aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Some JavaScript cleanups.Klaus Weidenbach2015-03-1513-1266/+1180
| | | | | | Adding some missing and remove some unnecessary semicolons. Change some comparing operators. Changed access to objects with dot operator.
* assure that badges will be displayed as circles no matter what font is used ↵Mario Vavti2015-03-142-7/+12
| | | | and if there is only one digit inside. move css to its proper place
* revert the revert - that is working. My test was bad.friendica2015-03-141-3/+3
|
* revert and rethinkfriendica2015-03-142-4/+4
|
* create terms for Diaspora mention tags - which in Diaspora are handled ↵friendica2015-03-132-9/+103
| | | | differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
* Merge pull request #929 from zzottel/masterRedMatrix2015-03-141-3/+3
|\ | | | | fix posts not showing up in network if author is not in connections
| * fix posts not showing up in network if author is not in connectionszottel2015-03-141-3/+3
| |
* | Merge pull request #928 from dawnbreak/docuRedMatrix2015-03-142-29/+69
|\ \ | |/ |/| Some documentation, fix chatroom service class lookup.
| * Some documentation, fix chatroom service class lookup.Klaus Weidenbach2015-03-142-29/+69
| | | | | | | | | | Add some Doxygen documentation and fixing a service class lookup for chatroom_create().
* | use local_channel() connnections to match the abook against when joining the ↵friendica2015-03-131-2/+2
| | | | | | | | abook on the discover tab.
* | make nav badges big enough to be clickable on small touch devicesfriendica2015-03-131-0/+5
| |
* | invoke tgroup_check() on diaspora posts/comments in case the recipient is a ↵friendica2015-03-131-19/+34
|/ | | | forum with channel_w_stream permissions restricted.
* update to-do listfriendica2015-03-133-3962/+2153
|
* revert thatfriendica2015-03-121-4/+25
|
* try to allow translation of ax regsfriendica2015-03-121-29/+52
|
* support a fair number of the common AX regsfriendica2015-03-121-5/+68
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-123-68/+99
|\
| * Merge pull request #927 from dawnbreak/masterRedMatrix2015-03-133-68/+99
| |\ | | | | | | Some cleanups and a bugfix.
| | * Some cleanups.Klaus Weidenbach2015-03-133-68/+99
| | | | | | | | | | | | | | | | | | Fixed dbesc_identifier(), but it is not used yet. Corrected some other variable names and variable initialization before using them.
* | | Add some AX vars to openid server.friendica2015-03-121-11/+28
|/ /
* | more JS=1 weirdnessfriendica2015-03-121-1/+1
| |
* | reduce the occurrence of duplicated notice() messagesfriendica2015-03-121-5/+8
| |
* | prepare for demise of google codefriendica2015-03-122-1/+9
| |
* | try and add some regsfriendica2015-03-122-1/+3
| |
* | Merge pull request #926 from dawnbreak/masterKlaus2015-03-121-56/+46
|\| | | | | Fix JavaScript problems on channels where you are not allowed to upload ...
| * Fix JavaScript problems on channels where you are not allowed to upload photos.Klaus Weidenbach2015-03-121-56/+46
|/ | | | | | Add some try...catch blocks around JavaScript that throws errors. This commit should fix the current problems that were introduced by an earlier commit.
* add generic_addon_settings template and minor fixesMario Vavti2015-03-123-2/+19
|
* Merge branch 'master' of https://github.com/friendica/redMario Vavti2015-03-121-1/+1
|\
| * substr() is a mysql alias for substring(). substring() is in the SQL ↵Habeas Codice2015-03-121-1/+1
| | | | | | | | | | | | standard and is supported by both databases.
* | some work on feature/addon settingsMario Vavti2015-03-123-43/+32
|/
* openid stufffriendica2015-03-112-36/+50
|
* Merge branch 'master' into openidfriendica2015-03-1114-25/+105
|\
| * remove the now redundant audio/video buttons and label the editor text style ↵friendica2015-03-118-11/+36
| | | | | | | | buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
| * Merge pull request #925 from unary/fixinsertRedMatrix2015-03-121-1/+1
| |\ | | | | | | add missing %d for abook_closeness
| | * add missing %d for abook_closenessMichael Johnston2015-03-111-1/+1
| | |
| * | make embeds bookmarkablefriendica2015-03-111-1/+1
| | |
| * | turn parse_url into the definitive url attaching mechanismfriendica2015-03-112-3/+35
| | |
| * | parse_url changes for oembed/zvideo/etc.friendica2015-03-111-8/+22
| |/
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-03-111-1/+4
| |\
| | * update sample-nginx.conf redirect to check for argsMario Vavti2015-03-111-1/+4
| | |
| * | don't relay diaspora comments to sys channelfriendica2015-03-111-0/+6
| |/
* | Merge branch 'master' into openidfriendica2015-03-1112-177/+16
|\|
| * skip trying to come up with an intelligent way to decide what photos should ↵friendica2015-03-112-20/+2
| | | | | | | | get a status post - leave it manual.
| * cleanup of old delegation stufffriendica2015-03-106-152/+5
| |
| * allow urls using the zot: or zots: URL schemes to exist without getting ↵friendica2015-03-101-1/+1
| | | | | | | | filtered away.
| * sql optimisation for affinity searches. A new index was added which wasn't ↵friendica2015-03-103-4/+8
| | | | | | | | added retro-actively to existing DBs as an update. It isn't clear if this helps sites any more than just restricting the abook table to certain channel_id's is (and this field is already indexed).
* | openid serverfriendica2015-03-111-0/+237
| |
* | first cut openid server. Mostly just getting it architecturally prepared - ↵friendica2015-03-101-1/+1
|/ | | | as there may be a few twists and turns ahead.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-101-31/+58
|\
| * Merge pull request #923 from dawnbreak/masterRedMatrix2015-03-111-31/+58
| |\ | | | | | | Fix SQL query for removing orphan hooks.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 07:56:46 +0000