aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-119-210/+331
|\
| * visit "random profile" featurefriendica2012-04-102-0/+10
| |
| * cleanup photo menusfriendica2012-04-102-11/+11
| |
| * more backend work on mail2 followersfriendica2012-04-101-0/+3
| |
| * fix_mce_lf on profilesfriendica2012-04-101-0/+5
| |
| * set default on get_avatarfriendica2012-04-101-1/+8
| |
| * Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pullfriendica2012-04-102-13/+11
| |\
| | * Remove Gravatar from core and add new hook avatar_lookup.Klaus Weidenbach2012-04-091-8/+6
| | | | | | | | | | | | | | | This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in. I haven't touched the language files yet. Are they updated automatically somehow?
| | * Rename gravatar_img() more generic to avatar_img().Klaus Weidenbach2012-04-092-5/+5
| | | | | | | | | | | | | | | I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service. First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
| * | Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-091-0/+10
| |\|
| | * more sane defaults datetime_convertfriendica2012-04-081-3/+6
| | |
| | * fix empty string timezonefriendica2012-04-081-0/+7
| | |
| * | fixed some typosAlexander Kampmann2012-04-091-4/+4
| | |
| * | made exceptions from the db optionalAlexander Kampmann2012-04-091-2/+30
| | | | | | | | | set address for updae mails correctly
| * | added exceptions to dba classAlexander Kampmann2012-04-091-188/+248
| |/ | | | | | | | | | | | | | | | | added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates added german translation for admin email
* | API: Improved the timeline. Several (disabled) tests with caching of photos.Michael Vogel2012-04-112-8/+12
| |
* | html2plain: changed behaviour for the "hr" element.Michael Vogel2012-04-091-1/+1
| |
* | API: Added Public TimelineMichael Vogel2012-04-081-5/+85
| |
* | API: Now mentions could work as well - only my client doesn't really workMichael Vogel2012-04-081-61/+72
| |
* | API: Basic support of the identica client added.Michael Vogel2012-04-081-0/+72
|/
* API: API is now enhanced. mentions, repeat and destroy now works.Michael Vogel2012-04-081-9/+142
|
* Merge commit 'upstream/master'Michael Vogel2012-04-0750-2/+14
|\
| * ignore utf8 offset error for unit testsfriendica2012-04-071-1/+3
| |
| * some work on testsfriendica2012-04-071-1/+1
| |
| * ignore removed pluginsfriendica2012-04-061-2/+9
| |
| * fix messed up config tables w/ duplicate entriesfriendica2012-04-061-1/+1
| |
| * revert config changes, we're getting duplicate keysfriendica2012-04-061-151/+147
| |
| * Merge branch 'pull'friendica2012-04-0550-147/+151
| |\
| | * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-0555-150/+837
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php
| | * | added index to config and pconfig tableAlexander Kampmann2012-04-051-152/+154
| | | | | | | | | | | | | | | | changed config.php to use REPLACE instead of INSERT, this removes one db hit.
| * | | pass autoname(0) testfriendica2012-04-051-0/+3
| | |/ | |/|
* | | Merge commit 'upstream/master'Michael Vogel2012-04-065-0/+82
|\| |
| * | also block outboundfriendica2012-04-041-0/+5
| | |
| * | log disabled requestsfriendica2012-04-041-2/+6
| | |
| * | fix config storage of booleansfriendica2012-04-041-0/+1
| | |
| * | bug: diaspora_enabled setting turns it on but doesn't fully turn it off.friendica2012-04-041-0/+8
| | |
| * | make contact ssl_policy change a function since it is used in a few placesfriendica2012-04-023-86/+50
| | |
| * | more ssl policy fixes and prevent delivery to soapbox when using local deliveryfriendica2012-04-022-0/+100
| | |
* | | Merge commit 'upstream/master'Michael Vogel2012-04-025-2/+162
|\| |
| * | remove zrl from query stringfriendica2012-04-021-0/+3
| | |
| * | catch a couple more Oo smiliesfriendica2012-04-011-0/+4
| | |
| * | add title to D* postsfriendica2012-04-011-1/+5
| | |
| * | allow users to set categories on their postsMichael Johnston2012-04-013-0/+142
| | |
| * | slight improvement in handling of plaintext feedsfriendica2012-04-011-2/+9
| | |
| * | that didn't quite work outfriendica2012-04-011-2/+2
| | |
* | | New script that checks if a script is runningMichael Vogel2012-04-011-0/+32
| | |
* | | poller: An optional lockfile is used to check if the poller is already runningMichael Vogel2012-04-011-0/+10
| | |
* | | Merge commit 'upstream/master'Michael Vogel2012-04-0113-44/+174
|\| |
| * | try slightly better detection of html in feedsfriendica2012-04-011-3/+4
| | |
| * | Merge branch 'pull'friendica2012-04-011-1/+1
| |\ \