| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | add additional page types to admin user report | friendica | 2012-07-05 | 1 | -2/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | a bit more colour | friendica | 2012-07-05 | 1 | -0/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | remove obsolete zot encapsulation functions | friendica | 2012-07-05 | 1 | -33/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge pull request #378 from fermionic/apparent-typo-in-function-name | friendica | 2012-07-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | my php thinks this is a typo | ||||
| | * | | | | | | | | | | | my php thinks this is a typo | Zach Prezkuta | 2012-07-05 | 1 | -1/+1 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #377 from fermionic/local-delete-blank-out-title-and-body | friendica | 2012-07-05 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | clear title and body of items on local delete | ||||
| | * | | | | | | | | | | | clear title and body of items on local delete | Zach Prezkuta | 2012-07-05 | 1 | -2/+4 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions | friendica | 2012-07-05 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | slightly better way of handling last loop | ||||
| | * | | | | | | | | | | | slightly better way of handling last loop | Zach Prezkuta | 2012-07-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions | friendica | 2012-07-05 | 2 | -9/+18 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some timeouts to prevent deadlock | ||||
| | * | | | | | | | | | | | add some timeouts to prevent deadlock | Zach Prezkuta | 2012-07-05 | 2 | -9/+18 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | term (tag, mention, category, file, etc.) table | friendica | 2012-07-05 | 3 | -7/+63 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-07-05 | 8 | -44/+235 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #373 from fermionic/more-list-fixes | friendica | 2012-07-05 | 2 | -21/+54 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix small bug in lists and revert Diaspora list processing to non-Markdo... | ||||
| | | * | | | | | | | | | | | | fix small bug in lists and revert Diaspora list processing to ↵ | Zach Prezkuta | 2012-07-05 | 2 | -21/+54 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-Markdownify version | ||||
| | * | | | | | | | | | | | | | Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions | friendica | 2012-07-05 | 6 | -23/+181 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / / | Prevent fcontact race conditions | ||||
| | | * | | | | | | | | | | | final db updates after testing | Zach Prezkuta | 2012-07-05 | 3 | -2/+15 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | cleanup some syntax errors in lock.php | Zach Prezkuta | 2012-07-05 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | "lock" is a reserved MySQL keyword | Zach Prezkuta | 2012-07-05 | 2 | -9/+9 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | minor cleanup in lock.php | Zach Prezkuta | 2012-07-05 | 1 | -0/+2 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | cleanup obsolete comments | Zach Prezkuta | 2012-07-05 | 1 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | add rudimentary locking capability to Friendica functions | Zach Prezkuta | 2012-07-05 | 4 | -21/+166 |
| | |/ / / / / / / / / / / | |||||
| * / / / / / / / / / / / | rev update | friendica | 2012-07-05 | 2 | -153/+170 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | recycle symbol woes with multiple html entity encode/decode cycles going on | friendica | 2012-07-04 | 1 | -0/+3 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | render the recycle symbol correctly on Diaspora reshares | friendica | 2012-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | some initial code and benchmarking for "red" content rendering engine | friendica | 2012-07-04 | 3 | -0/+866 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | restore translation of bbcode videos, events, bookmarks, etc. to diaspora | friendica | 2012-07-04 | 1 | -10/+27 |
| | | | | | | | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |