aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-0112-10/+108
|\
| * admin/dbsync not reporting failed updatesfriendica2015-02-012-2/+2
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-012-3/+4
| |\
| | * typo, see #884jeroenpraat2015-02-021-3/+3
| | * add multipart/mixed to getIconFromType()marijus2015-02-011-0/+1
| * | two tracks proceeding in parallel - first adding the ability to store a digit...friendica2015-02-018-4/+101
| |/
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-313-6/+16
| |\
| * | issue #885, autoperms not working for diaspora connectionsfriendica2015-01-311-1/+1
| * | revupfriendica2015-01-311-1/+1
* | | Merge branch 'master' into tresfriendica2015-01-31108-4218/+5439
|\ \ \ | | |/ | |/|
| * | 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 ch...friendica2015-01-306-4/+751
| * 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 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
| |\|
| * | 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
| |\ \
| * | | first cut at direntry template, right now just provide a mockup with a slider...friendica2015-01-271-0/+12
* | | | cleanup event form and various required indicators on inputsfriendica2015-01-295-9/+28
* | | | Merge branch 'master' into tresfriendica2015-01-29167-954/+1001
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
| | |/ / | |/| |
| * | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 17:47:01 +0000