aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | update for js_uploadfriendica2013-03-211-3/+3
|/
* Merge https://github.com/friendica/red into zpullfriendica2013-03-2110-5/+41
|\
| * Merge pull request #38 from beardy-unixer/masterfriendica2013-03-216-2/+32
| |\
| | * TypoThomas Willingham2013-03-212-2/+2
| | * Add register link to nav.Thomas Willingham2013-03-212-0/+6
| | * Revert randprof - that was stupid. If you have a local channel, you also hav...Thomas Willingham2013-03-201-15/+2
| | * Add a fallback or two to randprof.Thomas Willingham2013-03-201-2/+15
| | * Use load_pconfig in style.phpThomas Willingham2013-03-201-1/+2
| | * Make the channels profile tab actually do something.Thomas Willingham2013-03-203-1/+24
| * | Merge pull request #39 from zzottel/masterfriendica2013-03-211-1/+2
| |\ \
| | * | write notify settings to channel table when saving settingszottel2013-03-211-1/+2
| |/ /
| * | Merge pull request #37 from beardy-unixer/masterfriendica2013-03-193-2/+7
| |\|
| | * Add "channels" field to profile table.Thomas Willingham2013-03-203-2/+7
| |/
* / updatefriendica2013-03-213-12/+35
|/
* we'll need a special system channel (not attached to any account) for directo...friendica2013-03-183-10/+29
* Merge pull request #36 from beardy-unixer/masterfriendica2013-03-183-0/+28
|\
| * Allow admins to specify default mobile/accessibility theme.Thomas Willingham2013-03-173-0/+28
|/
* Merge pull request #34 from beardy-unixer/masterfriendica2013-03-153-29/+14
|\
| * Tidy upThomas Willingham2013-03-153-14/+8
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-03-1436-6000/+3420
| |\
| * | 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
* | | add xconfig table and functions, update strings and docofriendica2013-03-15107-955/+1707
* | | Merge https://github.com/friendica/red into zpullfriendica2013-03-142-2/+2
|\ \ \ | | |/ | |/|
| * | Fix path in photo_ablums.tplThomas Willingham2013-03-132-2/+2
* | | prepare for multiple content typesfriendica2013-03-142-70/+33
* | | update modification time whenever a directory related attribute is changedfriendica2013-03-131-2/+24
|/ /
* | 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
|/
* 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