aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* don't need this one right nowfriendica2012-07-111-0/+0
|
* use the colour wheelfriendica2012-07-117-3/+3
|
* move saved searches to new taxonomyfriendica2012-07-114-29/+39
|
* get rid of special "short salmon key" for statusnetfriendica2012-07-117-34/+15
|
* gracefully recover from datetime constructor issuesfriendica2012-07-112-3/+24
|
* catchupfriendica2012-07-112-30/+66
|
* catchupfriendica2012-07-103-14/+1
|
* add iconsfriendica2012-07-108-0/+240
|
* create fetch_tags function, make search work again, change logofriendica2012-07-1012-49/+61
|
* upstream fixes and a lot of taxonomy stufffriendica2012-07-1010-16/+32
|
* sliderfriendica2012-07-09421-1/+69069
|
* theme cleanupfriendica2012-07-0989-14646/+13
|
* making tags workfriendica2012-07-099-76/+163
|
* identity address is now a web-id or "webbie"friendica2012-07-094-26/+39
|
* remove bookmark content flagfriendica2012-07-084-57/+22
|
* Merge branch 'master' of file:////home/macgirvin/devfriendica2012-07-0757-290/+604
|\ | | | | | | | | Conflicts: boot.php
| * Merge https://github.com/friendica/friendica into pullfriendica2012-07-0756-77/+383
| |\
| | * Merge pull request #381 from fermionic/embed-multiple-private-photosfriendica2012-07-074-75/+380
| | |\ | | | | | | | | Embed multiple private photos
| | | * cleanupZach Prezkuta2012-07-071-5/+0
| | | |
| | | * fix bugsZach Prezkuta2012-07-074-19/+33
| | | |
| | | * allow more than one embedded private photoZach Prezkuta2012-07-074-139/+327
| | | |
| | | * add function to exclude embedded images when checking message lengthZach Prezkuta2012-07-071-4/+112
| | |/
| | * Merge pull request #379 from fermionic/events-display-wrong-in-diasporafriendica2012-07-071-1/+1
| | |\ | | | | | | | | remove check for event description in bb2diaspora
| | | * remove check for event description, since it's not required to create an eventZach Prezkuta2012-07-061-1/+1
| | | |
| | * | Merge pull request #380 from copyninja/masterfriendica2012-07-0751-1/+2
| | |\ \ | | | |/ | | |/| orient function should not be called on png image types
| | | * orient function uses exif_read_data for which valid image types are only ↵Vasudev Kamath2012-07-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JPEG and TIFF as per the document [1]. When trying to upload an screenshot with png type I was getting message as *failed* even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload [1] http://au2.php.net/manual/en/function.exif-read-data.php
| | | * Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-07-06249-2980/+38603
| | | |\ | | | |/ | | |/|
| | | * Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-2361-5236/+6419
| | | |\
| | | * \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-1140-1035/+1599
| | | |\ \
| | | * \ \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-045-6/+380
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-06-04174-10002/+18227
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-05-1212-6179/+3648
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-05-1280-1204/+8689
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-05-05141-6803/+10113
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-04-27425-23370/+14497
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaVasudev Kamath2012-04-22382-38692/+1820
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Executable permission missing on scriptVasudev Kamath2012-04-211-0/+0
| | | | | | | | | | | | |
| | | * | | | | | | | | | Few more files with unnecessary executable permissionsVasudev Kamath2012-04-2175-0/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | rev updatefriendica2012-07-072-214/+222
| |/ / / / / / / / / / /
* / / / / / / / / / / / begin divergencefriendica2012-07-071-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | add additional page types to admin user reportfriendica2012-07-051-2/+4
| | | | | | | | | | |
* | | | | | | | | | | a bit more colourfriendica2012-07-051-0/+4
| | | | | | | | | | |
* | | | | | | | | | | remove obsolete zot encapsulation functionsfriendica2012-07-051-33/+0
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #378 from fermionic/apparent-typo-in-function-namefriendica2012-07-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | my php thinks this is a typo
| * | | | | | | | | | | my php thinks this is a typoZach Prezkuta2012-07-051-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #377 from fermionic/local-delete-blank-out-title-and-bodyfriendica2012-07-051-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | clear title and body of items on local delete
| * | | | | | | | | | | clear title and body of items on local deleteZach Prezkuta2012-07-051-2/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditionsfriendica2012-07-051-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | slightly better way of handling last loop
| * | | | | | | | | | | slightly better way of handling last loopZach Prezkuta2012-07-051-1/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditionsfriendica2012-07-052-9/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some timeouts to prevent deadlock
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 03:00:46 +0000