aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* more overflow hidden important so it worksfriendica2013-12-061-1/+1
* add suggestions to a couple of other pagesfriendica2013-12-062-0/+4
* suggestion widgetfriendica2013-12-066-3/+60
* Merge https://github.com/friendica/red into zpullfriendica2013-12-062-188/+189
|\
| * Merge pull request #227 from tobiasd/DE20131206tobiasd2013-12-062-188/+189
| |\
| | * DE: update to the stringsTobias Diekershoff2013-12-062-188/+189
* | | need include/conversation for events nowfriendica2013-12-061-0/+1
|/ /
* | yeah - that's what I'm going to do. we'll just keep system notifications. If ...friendica2013-12-063-329/+7178
* | doc updatesfriendica2013-12-06113-2065/+1639
* | some code cleanup - gad I forgot what a mess the "other" notifications tabs (...friendica2013-12-066-7391/+11
* | move profile tabs and network/matrix tabs to include/conversationfriendica2013-12-053-198/+186
* | Merge https://github.com/friendica/red into zpullfriendica2013-12-051-2/+2
|\ \
| * \ Merge pull request #223 from zzottel/masterfriendica2013-12-051-2/+2
| |\ \
| | * | Make it possible to change visibility without changing name.zottel2013-12-051-2/+2
| | |/
* | | couple of errant SQL queriesfriendica2013-12-051-2/+2
* | | remove some cruftfriendica2013-12-051-69/+5
|/ /
* | make some "selection-is-selected" classes work againfriendica2013-12-053-3/+3
* | issue #224friendica2013-12-051-0/+6
* | issue #225friendica2013-12-053-7/+31
* | couple of additional checksfriendica2013-12-051-1/+12
* | mod_authtest --- magic-auth diagnostic for those that are too freaking import...friendica2013-12-054-10/+147
|/
* generate a small amount of entropy to avoid duplicate notifications from esse...friendica2013-12-043-2/+12
* add icon_trnalsatefriendica2013-12-042-0/+52
* more icon workfriendica2013-12-045-9/+5
* add poco and follow to default xchan creationfriendica2013-12-042-2/+5
* more icon updatesfriendica2013-12-0411-48/+23
* Merge https://github.com/friendica/red into zpullfriendica2013-12-043-548/+715
|\
| * Merge pull request #222 from git-marijus/masterfriendica2013-12-043-548/+715
| |\
| | * split conversation.css out of style.cssmarijus2013-12-043-548/+715
| |/
* / include re-organisation and more doco, post_to_red fix ampersands in categoriesfriendica2013-12-047-59/+62
|/
* add hooks to zot-finger and import_xchanfriendica2013-12-032-0/+4
* more documentation workfriendica2013-12-031-75/+106
* on successful magic-auth, put remote_service_class and remote_hub into the se...friendica2013-12-032-4/+23
* reorganise a few included functions - notably identity related functionsfriendica2013-12-035-768/+770
* rev updatefriendica2013-12-031-1/+1
* Merge pull request #221 from git-marijus/masterfriendica2013-12-033-96/+114
|\
| * should fix typos the right way...marijus2013-12-031-1/+1
| * this should remain in style.cssmarijus2013-12-032-2/+7
| * split out mod_message and a typomarijus2013-12-033-96/+109
| * Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-0311-364/+161
| |\ | |/ |/|
* | undo last change to comment_email - these are checked for validityfriendica2013-12-021-1/+1
* | ensure that every imported channel has a primary hublocfriendica2013-12-023-2/+18
* | clear floats on the connect buttonfriendica2013-12-021-0/+1
* | Merge https://github.com/friendica/red into zpullfriendica2013-12-022-1365/+1827
|\ \
* | | more work on magic-authfriendica2013-12-022-4/+17
* | | magic-auth re-factorfriendica2013-12-022-173/+122
* | | refactor magic-authfriendica2013-12-028-194/+12
| | * Revert "update spin.js to latest version"marijus2013-12-021-11/+5
| | * Revert "only show user-photo if not local user"marijus2013-12-021-1/+1
| | * Revert "some jot tools structuring and styling"marijus2013-12-023-96/+54