aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* we don't need this any morefriendica2013-03-251-84/+0
* docofriendica2013-03-253-11/+106
* uri to midfriendica2013-03-252-2/+2
* Merge pull request #43 from beardy-unixer/masterfriendica2013-03-255-11/+9
|\
| * Updated build_query for midThomas Willingham2013-03-255-11/+9
|/
* fix mod_display breakage.friendica2013-03-242-3/+10
* descriptive textfriendica2013-03-231-0/+23
* Merge https://github.com/friendica/red into zpullfriendica2013-03-2348-5/+429
|\
| * Merge pull request #42 from beardy-unixer/masterfriendica2013-03-2347-2/+427
| |\
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-03-231-3/+2
| | |\ | | |/ | |/|
| * | Redbasic - get rid of max-height for images (got lost in the merge last time ...Thomas Willingham2013-03-231-3/+2
| | * Implement prettyPhoto (somewhat).Thomas Willingham2013-03-233-2/+16
| | * Remove Twatter/Facebook shit.Thomas Willingham2013-03-231-1/+1
| | * Add prettyPhoto library.Thomas Willingham2013-03-2344-0/+411
| |/
* / rev updatefriendica2013-03-233-1535/+1560
|/
* Merge https://github.com/friendica/red into zpullfriendica2013-03-213-15/+17
|\
| * Merge pull request #41 from unary/eventsfriendica2013-03-213-15/+17
| |\
| | * small fixes for eventsMichael Johnston2013-03-213-15/+17
| |/
* | rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no longer...friendica2013-03-2127-284/+315
* | support various and multiple content_types on the display side - still have s...friendica2013-03-211-7/+28
|/
* Merge https://github.com/friendica/red into zpullfriendica2013-03-211-1/+1
|\
| * Merge pull request #40 from MicMee/masterfriendica2013-03-211-1/+1
| |\
| | * otherwise add profile wont workMichael Meer2013-03-211-1/+1
| |/
* | main_slider hookfriendica2013-03-211-1/+4
* | 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