aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add new connections to default group (if any)friendica2013-03-275-62/+47
|
* update manage table and some documentationfriendica2013-03-2746-210/+310
|
* more docofriendica2013-03-261-5/+8
|
* set hidden flags on new directory entries, not just existing onesfriendica2013-03-263-6/+29
|
* magic auth issuefriendica2013-03-262-4/+12
|
* 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
|\ | | | | Update build_query for mid
| * 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
| |\ | | | | | | Use prettyPhoto for photo albums
| | * 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
| | | | | | | | | | | | it was fixed)
| | * 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 events
| | * small fixes for eventsMichael Johnston2013-03-213-15/+17
| |/
* | rename 'uri' (and parent_uri) to 'mid' (and parent_mid) since these no ↵friendica2013-03-2127-284/+315
| | | | | | | | longer remotely resemble uri's and are actually message_id's. This change is potentially destabilising because it touches a lot of code and structure. But it has to get done and there's no better time than the present.
* | support various and multiple content_types on the display side - still have ↵friendica2013-03-211-7/+28
|/ | | | some work to do on the posting side.
* Merge https://github.com/friendica/red into zpullfriendica2013-03-211-1/+1
|\
| * Merge pull request #40 from MicMee/masterfriendica2013-03-211-1/+1
| |\ | | | | | | small fix for to add additional profiles
| | * 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
| |\ | | | | | | Small fixes
| | * 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 ↵Thomas Willingham2013-03-201-15/+2
| | | | | | | | | | | | have it's xchan.
| | * 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
| |\ \ | | | | | | | | update channel notify flags on save settings
| | * | 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 to profile table
| | * 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 ↵friendica2013-03-183-10/+29
| | | | directory synchronisation
* Merge pull request #36 from beardy-unixer/masterfriendica2013-03-183-0/+28
|\ | | | | Admin panel mobility/accessibility theme options
| * 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
|\ | | | | Admin panel
| * Tidy upThomas Willingham2013-03-153-14/+8
| |
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-03-1436-6000/+3420
| |\ | | | | | | | | | | | | Conflicts: view/theme/redbasic/css/style.css
| * | Get admin/users mostly working. Still need to associate channels with accounts.Thomas Willingham2013-03-122-18/+9
| | |