aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-01-31108-4218/+5439
|\ | | | | | | | | Conflicts: include/zot.php
| * Add more detail about directory_mode settings to default config and docsHabeas Codice2015-01-302-5/+15
| |
| * prevent silly fake null date from causing problems OTW from older buildsHabeas Codice2015-01-301-1/+1
| |
| * sync_locations() toggle DB flag functions were broken - result of postgres ↵friendica2015-01-306-4/+751
| | | | | | | | changes. Split these into seperate set and reset blocks.
| * fix random profilesfriendica2015-01-301-2/+3
| |
| * 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 ↵friendica2015-01-3086-4189/+4483
| |/ | | | | | | weekly doc updates
| * Merge pull request #881 from cvogeley/masterRedMatrix2015-01-302-1/+5
| |\ | | | | | | Add allowed and not allowed emails to the UI in the
| | * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-292-1/+5
| | | | | | | | | | | | admin menu
| * | 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
| | | |\ \ | | | | |/ | | | |/| fixes
| | | | * small autocomplete fix adding space to the outputRedSwede2015-01-291-1/+1
| | | | | | | | | | | | | | | | | | | | provides: the ability to press enter after pressing enter during the mention-js-popup (this second enter should behave as a normal one) FF35
| | | | * 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
| |\|
| * | 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
| | | | | | | | | | | | that will take a bit more fiddling
| * | updates to put rating info into the local xlink before sending it to known ↵friendica2015-01-282-2/+48
| | | | | | | | | | | | directory servers
| * | Merge branch 'master' into pocoratefriendica2015-01-289-21/+75
| |\ \
| * | | first cut at direntry template, right now just provide a mockup with a ↵friendica2015-01-271-0/+12
| | | | | | | | | | | | | | | | slider and rating count to look at.
* | | | cleanup event form and various required indicators on inputsfriendica2015-01-295-9/+28
| | | |
* | | | Merge branch 'master' into tresfriendica2015-01-29167-954/+1001
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
| * | | implement diaspora profile message (oops) or updated profile photos won't be ↵friendica2015-01-292-22/+5
| | | | | | | | | | | | | | | | updated
| * | | 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 ↵Habeas Codice2015-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | statement-locked. FWIW, the exact same queries listed for postgres are perfectly valid and equivalent on mysql. no need for separate statements.
| | * | | 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
| | | | | | | | | | | | | | | | | | | | suggestedchats: normalize to standard SQL
| | * | | 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 ↵friendica2015-01-281-0/+12
| | | | | | | | | | | | | | | | | | | | work in progress should be minor
| * | | | remote_user => remote_channelfriendica2015-01-2833-47/+47
| | | | |
| * | | | local_user => local_channelfriendica2015-01-28155-886/+886
| | |/ / | |/| |
| * | | make sure we honour the disable_discover_tab preffriendica2015-01-281-1/+5
| | | |
| * | | allow diaspora posts to be delivered to the discover channel unless ↵friendica2015-01-281-1/+5
| | | | | | | | | | | | | | | | prohibited from doing so.
| * | | limit the number of forums that can be tagged in a single post - default is ↵friendica2015-01-281-8/+46
| | | | | | | | | | | | | | | | 2. The reason is simple - count how many posts would be in transit simultaneously if this was unlimited and somebody tagged 40-50 forums. In practice when used legitimately - we've rarely seen more than two, in fact I don't recall seeing more than two ever. Typically it is one and occasionally two. Changing the default is tricky - a client system cannot do it, but the site hosting a forum can choose to. Since not all sites that host forums will choose to do so, the ordering of the mentions would then be important.
| * | | 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
| | | | | | | | | | | | | | | | | | | | This reverts commit 3e8fa8c8a2cd125dd7aa0a9482e98ae39db61e52.
| * | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 22:29:22 +0000