aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-2452-972/+605
|\ | | | | | | to be in sync with master repro
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-231-2/+3
| |\
| | * Ooops, included site specific hackThomas Willingham2014-01-241-6/+0
| | |
| | * Make share previews a bit longer. We can't go any longer than thisThomas Willingham2014-01-241-2/+9
| | | | | | | | | | | | | | | | | | without suhosin starting to break things for channels with long names - this limit works with the channel with the longest name in the matrix today, but we may need to make this a pconfig anyway.
| * | add zid to audio/video (again)friendica2014-01-232-13/+50
| |/
| * display a somewhat more pleasant hovertip on qr codesfriendica2014-01-231-1/+1
| |
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-2344-411/+0
| |\
| | * Merge pull request #281 from beardy-unixer/masterfriendica2014-01-2344-411/+0
| | |\ | | | | | | | | Kill prettyphoto
| | | * Nobody seems to be using that anymoreThomas Willingham2014-01-2344-411/+0
| | | |
| * | | fix marital partner linkingfriendica2014-01-232-26/+24
| |/ /
| * | Merge https://github.com/friendica/red into zpullfriendica2014-01-231-1/+1
| |\ \
| * | | mod_profperm migratedfriendica2014-01-234-519/+527
| | | |
* | | | build url, deleted logger commandsMichael Meer2014-01-231-4/+3
| | | |
* | | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-233-2/+3
|\ \ \ \ | | |/ / | |/| | | | | | to be in sync with main repro
| * | | the bootstrap theme is obsolete, use clean insteadtobiasd2014-01-231-1/+1
| |/ /
| * | missing filename in uploaded photos (we don't really use this, but we will ↵friendica2014-01-222-1/+2
| | | | | | | | | | | | need to have a filename to export via DAV or API and the original filename would be the most likely choice).
* | | preperation for ping, need training in SQL :(Michael Meer2014-01-231-1/+6
| | |
* | | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-236-24/+58
|\| | | | | | | | | | | to be in sync with main repro
| * | fix api/red/photos when supplied with an album namefriendica2014-01-221-1/+1
| | |
| * | API: provide a link to photo albums in api/red/albumsfriendica2014-01-221-1/+5
| | |
| * | Merge https://github.com/friendica/red into zpullfriendica2014-01-222-7/+10
| |\|
| | * Merge pull request #279 from git-marijus/masterfriendica2014-01-222-5/+5
| | |\ | | | | | | | | make network tabs regard selected group (collection) and vice versa
| | | * update argument ?f=marijus2014-01-221-2/+2
| | | |
| | | * make network tabs regard selected group (collection) and vice versamarijus2014-01-222-4/+4
| | | |
| | * | Merge pull request #280 from beardy-unixer/masterfriendica2014-01-221-2/+5
| | |\ \ | | | |/ | | |/| Give pages enough to construct a share button.
| | | * Give pages enough to construct a share button.Thomas Willingham2014-01-221-2/+5
| | |/
| * / try to reduce the number of simulaneous deliveries of the same post when ↵friendica2014-01-222-15/+42
| |/ | | | | | | dealing with owner relays that have more than one channel instance. If things melt down in the next few hours and I'm not available please revert this. I've reviewed a few times and think it's OK, but this part of the delivery code is traditionally touchy.
* | Merge branch 'master' of https://github.com/friendica/redMichael Meer2014-01-222-9/+5
|\| | | | | | | to keep the repros in sync
| * simplify chanview authentication and make sure it carries through multiple ↵friendica2014-01-222-9/+5
| | | | | | | | generations
* | reorg formula data for hubloc checksMichael Meer2014-01-222-5/+15
| |
* | start with hubloc pingMichael Meer2014-01-221-0/+9
|/
* remove debuggingfriendica2014-01-211-1/+0
|
* fix location of string file in Translations.md, fix some permissions and ↵friendica2014-01-213-18/+28
| | | | owner vagueness (potential bugs) in profile_tabs()
* seems you can't easily have a blank password for DAV guests, so the guest ↵friendica2014-01-212-2/+10
| | | | password is now +++
* text - change remove account button to remove channelfriendica2014-01-211-1/+1
|
* add primary webbie to directory popupfriendica2014-01-213-0/+6
|
* push new messages.pofriendica2014-01-212-86/+84
|
* add the quota and volume size codefriendica2014-01-211-1/+29
|
* Merge https://github.com/friendica/red into zpullfriendica2014-01-211-1/+1
|\
| * Merge pull request #278 from zzottel/masterfriendica2014-01-211-1/+1
| |\ | | | | | | added feed2red.pl
| | * added feed2red.plzottel2014-01-211-1/+1
| | |
* | | fix the admin interface to pending registrationsfriendica2014-01-213-6/+5
|/ /
* | sql errorfriendica2014-01-211-1/+1
| |
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-213-1/+12
|\ \
| * \ Merge pull request #277 from git-marijus/masterfriendica2014-01-201-1/+1
| |\ \ | | |/ | |/| lighttpd sample conf update
| | * lighttpd sample conf updatemarijus2014-01-211-1/+1
| |/
| * Nginx conf updateThomas Willingham2014-01-211-0/+8
| |
| * Debian install script docoThomas Willingham2014-01-211-0/+3
| |
* | move some store thingsfriendica2014-01-214-3/+9
| |
* | create store directory if it's missing before initialising DAVfriendica2014-01-211-1/+4
|/