| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge pull request #379 from fermionic/events-display-wrong-in-diaspora | friendica | 2012-07-07 | 1 | -1/+1 |
| |\ |
|
| | * | 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 uses exif_read_data for which valid image types are only JPEG... | Vasudev Kamath | 2012-07-07 | 1 | -1/+2 |
| | * | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-07-06 | 249 | -2980/+38603 |
| | |\
| |/
|/| |
|
| * | | 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 | 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 | 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 | 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 | 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-Markdownify... | Zach Prezkuta | 2012-07-05 | 2 | -21/+54 |
| | * | | | | Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditions | friendica | 2012-07-05 | 6 | -23/+181 |
| | |\ \ \ \
| | |/ / /
| |/| / /
| | |/ / |
|
| | | * | | 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 |
| * | | fix !@#$ tinymce linebreaks for the thousandth time | friendica | 2012-07-04 | 6 | -139/+162 |
| * | | add smarty engine, remove some obsolete zot1 stuff | friendica | 2012-07-03 | 139 | -22/+28796 |
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-07-03 | 5 | -7/+239 |
| |\ \ |
|
| | * | | Diabook directory wide variants. | Thomas Willingham | 2012-07-04 | 5 | -7/+239 |
| * | | | punycode hostname | friendica | 2012-07-03 | 2 | -1/+15 |
| * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-07-03 | 9 | -7/+31 |
| |\| | |
|
| | * | | Merge pull request #372 from rdc/master | Thomas Willingham | 2012-07-03 | 7 | -7/+7 |
| | |\ \ |
|
| | | * | | Limiting .directory-photo-wrapper styles to <section> so as not to | Zvi ben Yaakov (a.k.a rdc) | 2012-07-03 | 7 | -7/+7 |
| | |/ / |
|
| | * | | Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length | friendica | 2012-07-02 | 2 | -0/+24 |
| | |\ \ |
|
| | | * | | add ability to set maximum pixel length of uploaded pictures | Zach Prezkuta | 2012-07-02 | 2 | -0/+24 |
| | |/ / |
|
| * / / | add link to shares | friendica | 2012-07-03 | 3 | -59/+61 |
| |/ / |
|
| * | | fix diabook directory pages (only the normal style - any volunteers for the w... | friendica | 2012-07-02 | 6 | -24/+318 |
| * | | fix double lines | friendica | 2012-07-02 | 3 | -80/+120 |
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-07-02 | 4 | -7/+57 |
| |\ \ |
|
| | * \ | Merge branch 'master' of https://github.com/friendica/friendica | Thomas Willingham | 2012-07-02 | 6 | -14/+23 |
| | |\ \ |
|
| | * | | | Various theme stuff. | Thomas Willingham | 2012-07-02 | 4 | -7/+57 |
| * | | | | try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up ... | friendica | 2012-07-02 | 4 | -6/+10 |
| * | | | | "babel" diagnostic - convert bbcode to different formats and back again | friendica | 2012-07-01 | 1 | -0/+56 |
| | |/ /
|/| | |
|
