aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-231-1/+1
|\ \
| * | the bootstrap theme is obsolete, use clean insteadtobiasd2014-01-231-1/+1
| | |
* | | mod_profperm migratedfriendica2014-01-234-519/+527
|/ /
* | 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).
* | 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.
* simplify chanview authentication and make sure it carries through multiple ↵friendica2014-01-222-9/+5
| | | | generations
* 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
|/
* Merge https://github.com/friendica/red into zpullfriendica2014-01-201-0/+1
|\
| * Add BBCode extensions to docoThomas Willingham2014-01-201-0/+1
| |
* | when loading a single thread on the channel page, tell JS that there isn't ↵friendica2014-01-201-2/+6
|/ | | | any more content to load.
* Merge https://github.com/friendica/red into zpullfriendica2014-01-203-3/+8
|\
| * Merge pull request #276 from MicMee/masterfriendica2014-01-201-2/+3
| |\ | | | | | | no need to have a doule hublocid
| | * no need to have a doule hublocidMichael Meer2014-01-201-2/+3
| | |
| * | Merge pull request #275 from MicMee/masterfriendica2014-01-203-3/+7
| |\| | | | | | | added buttons to perform later hubloc actions
| | * added buttons to perform later hubloc actionsMichael Meer2014-01-203-3/+7
| | |
* | | Add external resource list so this stuff doesn't get lost. Please update it ↵friendica2014-01-202-1/+23
|/ / | | | | | | if you know of other related projects.
* / transifex didn't like plural-forms and now they don't like it commented out. ↵friendica2014-01-202-225/+220
|/ | | | So we'll try uncommenting the sucker and see if they like it again.
* zidify audio/video linksfriendica2014-01-201-7/+14
|
* catch auth exceptionsfriendica2014-01-202-3/+8
|
* bring photo tagging back which hasn't worked since forking from Friendica - ↵friendica2014-01-192-184/+53
| | | | this is untested and displaying photo tags will now be broken as we're now storing tags with the item attached to the photo and not in the photo. But the point is we've eliminated the OStatus/SWAP0 forced spam crap and can start fresh.
* revert 26dfcecf054e1friendica2014-01-191-6/+2
|
* Merge https://github.com/friendica/red into zpullfriendica2014-01-192-3/+7
|\