Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | call item_translate hook if source language is not acceptable, ignore ↵ | friendica | 2012-07-16 | 1 | -2/+17 |
| | | | | message if it cannot be translated. | ||||
* | check for existence, not value of $arr['term'] | friendica | 2012-07-16 | 1 | -1/+1 |
| | |||||
* | split up get_browser_language() to use in additional ways | friendica | 2012-07-16 | 4 | -3/+17 |
| | |||||
* | use include/language.php for all language and translation code | friendica | 2012-07-16 | 6 | -148/+145 |
| | |||||
* | contact edit slider | friendica | 2012-07-15 | 4 | -2/+25 |
| | |||||
* | change readme | friendica | 2012-07-15 | 1 | -6/+3 |
| | |||||
* | more work on json notifications, now working except for notify popup | friendica | 2012-07-15 | 6 | -92/+90 |
| | |||||
* | updates | friendica | 2012-07-14 | 8 | -71/+137 |
| | |||||
* | merge upstream, slider work, refactor ping module, language selection work | friendica | 2012-07-13 | 42 | -284/+11865 |
| | |||||
* | add plink to profile change notifications | friendica | 2012-07-12 | 3 | -5/+12 |
| | |||||
* | language detection and sparkle links added to plinks where appropriate | friendica | 2012-07-12 | 12 | -15/+45 |
| | |||||
* | don't need this one right now | friendica | 2012-07-11 | 1 | -0/+0 |
| | |||||
* | use the colour wheel | friendica | 2012-07-11 | 7 | -3/+3 |
| | |||||
* | move saved searches to new taxonomy | friendica | 2012-07-11 | 4 | -29/+39 |
| | |||||
* | get rid of special "short salmon key" for statusnet | friendica | 2012-07-11 | 7 | -34/+15 |
| | |||||
* | gracefully recover from datetime constructor issues | friendica | 2012-07-11 | 2 | -3/+24 |
| | |||||
* | catchup | friendica | 2012-07-11 | 2 | -30/+66 |
| | |||||
* | catchup | friendica | 2012-07-10 | 3 | -14/+1 |
| | |||||
* | add icons | friendica | 2012-07-10 | 8 | -0/+240 |
| | |||||
* | create fetch_tags function, make search work again, change logo | friendica | 2012-07-10 | 12 | -49/+61 |
| | |||||
* | upstream fixes and a lot of taxonomy stuff | friendica | 2012-07-10 | 10 | -16/+32 |
| | |||||
* | slider | friendica | 2012-07-09 | 421 | -1/+69069 |
| | |||||
* | theme cleanup | friendica | 2012-07-09 | 89 | -14646/+13 |
| | |||||
* | making tags work | friendica | 2012-07-09 | 9 | -76/+163 |
| | |||||
* | identity address is now a web-id or "webbie" | friendica | 2012-07-09 | 4 | -26/+39 |
| | |||||
* | remove bookmark content flag | friendica | 2012-07-08 | 4 | -57/+22 |
| | |||||
* | Merge branch 'master' of file:////home/macgirvin/dev | friendica | 2012-07-07 | 57 | -290/+604 |
|\ | | | | | | | | | Conflicts: boot.php | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-07-07 | 56 | -77/+383 |
| |\ | |||||
| | * | Merge pull request #381 from fermionic/embed-multiple-private-photos | friendica | 2012-07-07 | 4 | -75/+380 |
| | |\ | | | | | | | | | Embed multiple private photos | ||||
| | | * | cleanup | Zach Prezkuta | 2012-07-07 | 1 | -5/+0 |
| | | | | |||||
| | | * | fix bugs | Zach Prezkuta | 2012-07-07 | 4 | -19/+33 |
| | | | | |||||
| | | * | allow more than one embedded private photo | Zach Prezkuta | 2012-07-07 | 4 | -139/+327 |
| | | | | |||||
| | | * | add function to exclude embedded images when checking message length | Zach Prezkuta | 2012-07-07 | 1 | -4/+112 |
| | |/ | |||||
| | * | Merge pull request #379 from fermionic/events-display-wrong-in-diaspora | friendica | 2012-07-07 | 1 | -1/+1 |
| | |\ | | | | | | | | | remove check for event description in bb2diaspora | ||||
| | | * | remove check for event description, since it's not required to create an event | Zach Prezkuta | 2012-07-06 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge pull request #380 from copyninja/master | friendica | 2012-07-07 | 51 | -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 Kamath | 2012-07-07 | 1 | -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/friendica | Vasudev Kamath | 2012-07-06 | 249 | -2980/+38603 |
| | | |\ | | | |/ | | |/| | |||||
| | | * | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-23 | 61 | -5236/+6419 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-11 | 40 | -1035/+1599 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-04 | 5 | -6/+380 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-06-04 | 174 | -10002/+18227 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-12 | 12 | -6179/+3648 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-12 | 80 | -1204/+8689 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-05-05 | 141 | -6803/+10113 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-04-27 | 425 | -23370/+14497 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-04-22 | 382 | -38692/+1820 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Executable permission missing on script | Vasudev Kamath | 2012-04-21 | 1 | -0/+0 |
| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | Few more files with unnecessary executable permissions | Vasudev Kamath | 2012-04-21 | 75 | -0/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | rev update | friendica | 2012-07-07 | 2 | -214/+222 |
| |/ / / / / / / / / / / |