aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-154-3/+13
|\
| * open contact edit in same windowfriendica2012-04-151-1/+1
| * Merge pull request #234 from copyninja/masterfriendica2012-04-142-0/+0
| |\
| | * Another bunch of executable permission removalVasudev Kamath2012-04-142-0/+0
| * | string fix: typo. slow down scroll to top in dispysSimon L'nu2012-04-141-2/+2
| * | bug #372 - category feedsfriendica2012-04-141-0/+10
| |/
* | DBA: Reverting back to original sourceMichael Vogel2012-04-141-3/+1
* | DBA: Nothing really done ..Michael Vogel2012-04-141-71/+0
* | Merge commit 'upstream/master'Michael Vogel2012-04-145-16/+39
|\|
| * one morefriendica2012-04-131-1/+1
| * additional marital status selectorsfriendica2012-04-131-1/+1
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-04-132-1/+27
| |\
| | * stray debug statements, forgot to filter pending contactsfriendica2012-04-121-5/+5
| | * bug #369 - show contacts who are not in any groupsfriendica2012-04-122-4/+19
| * | move html out of lang_selector() and new template lang_selector.tplFabio Comuni2012-04-131-9/+16
| * | validate_url allow naked subdomain if is "localhost"Fabio Comuni2012-04-131-3/+4
* | | Merge commit 'upstream/master'Michael Vogel2012-04-133-214/+226
|\ \ \ | | |/ | |/|
| * | query to find un-grouped contactsfriendica2012-04-121-1/+12
| |/
| * reverting recent db driver changes - won't install cleanly, won't update clea...friendica2012-04-121-274/+186
| * table cleanupfriendica2012-04-122-0/+19
* | DBA: Deactivation of the mysqli-class for testing purposes.Michael Vogel2012-04-131-30/+31
* | 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
| | * Rename gravatar_img() more generic to avatar_img().Klaus Weidenbach2012-04-092-5/+5
| * | 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
| * | added exceptions to dba classAlexander Kampmann2012-04-091-188/+248
| |/
* | 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
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 20:56:47 +0000