aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-03-1436-6000/+3420
|\
| * Fix path in photo_ablums.tplThomas Willingham2013-03-132-2/+2
| * directory synchronisation timestampsfriendica2013-03-134-3/+22
| * undofriendica2013-03-122-5/+18
| * update xchans on url changefriendica2013-03-122-4/+9
| * tell it like it isfriendica2013-03-122-20/+3
| * tell it like it is.friendica2013-03-123-2/+5
| * make reshares translateablefriendica2013-03-112-71/+80
| * fix typosfriendica2013-03-112-3/+3
| * unknown columnfriendica2013-03-112-3/+3
| * class def for reshared contentfriendica2013-03-112-2/+2
| * dangerous typo that removes all your hublocs, fix reshare formattingfriendica2013-03-116-39/+50
| * likes were somewhat confused. Unconfuse them.friendica2013-03-112-3/+3
| * cleanupfriendica2013-03-109-1008/+9
| * .friendica2013-03-1018-4888/+3263
* | Get admin/users mostly working. Still need to associate channels with accounts.Thomas Willingham2013-03-122-18/+9
* | Get rid of max-height - no longer breaks newer versions of chrome, but does b...Thomas Willingham2013-03-111-3/+2
|/
* Smarty templateThomas Willingham2013-03-111-0/+14
* Make idiot mode colour schemes work.Thomas Willingham2013-03-112-3/+11
* And another.Thomas Willingham2013-03-101-171/+0
* Oops, remove erroneously committed files.Thomas Willingham2013-03-102-42/+0
* Redbasic - add stupid mode theme settings. Partial functionality.Thomas Willingham2013-03-105-3/+234
* Merge pull request #32 from unary/eventsfriendica2013-03-064-7/+8
|\
| * some fixes related to eventsMichael Johnston2013-03-074-7/+8
|/
* clean up some funky menu interactionsfriendica2013-03-064-20/+20
* fix comment permissions on display (again) and clean up an error seen in the ...friendica2013-03-062-2/+9
* get rid of html from mod_suggestfriendica2013-03-065-32/+58
* fix font-sizefriendica2013-03-061-1/+1
* tweaky tweak, plus add share tracking db, and don't show acl for guest postin...friendica2013-03-0611-45/+58
* replace old intro linkfriendica2013-03-061-1/+1
* stray target= which wasn't caught earlierfriendica2013-03-062-2/+2
* add a fixmefriendica2013-03-061-0/+1
* randprof sorta workingfriendica2013-03-064-7/+7
* consistencyfriendica2013-03-051-4/+8
* send to chanview, not remote profilefriendica2013-03-051-1/+1
* hide hidden entriesfriendica2013-03-051-0/+2
* basic friend suggestions (but not "new to the network and have no friends at ...friendica2013-03-057-32/+92
* fix selected nav itemfriendica2013-03-051-1/+1
* conflicting class namefriendica2013-03-054-4/+4
* tweaksfriendica2013-03-052-9/+9
* fix transparencyfriendica2013-03-051-0/+0
* tweaksfriendica2013-03-057-14/+14
* typo in directing mod/follow to a login if not logged infriendica2013-03-051-1/+1
* just tinkering and trying a few things - don't get upset. It can all be rever...friendica2013-03-0510-102/+128
* fix timeago (again), webfinger new spec implemented, some theme workfriendica2013-03-0416-174/+133
* cleanup affinity toolfriendica2013-03-0357-307/+350
* improve mod/display for local users - use their own copy if possiblefriendica2013-03-022-12/+24
* add account_external for linking to legacy authentication infrastructure (e.g...friendica2013-03-014-4/+16
* edits might really work nowfriendica2013-02-281-1/+2
* this might make edits update across the wire, or it might notfriendica2013-02-284-3/+233