aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | |/ |/|
* | 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
| * | add some timeouts to prevent deadlockZach Prezkuta2012-07-052-9/+18
| | |
* | | term (tag, mention, category, file, etc.) tablefriendica2012-07-053-7/+63
| | |
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-07-058-44/+235
|\ \ \
| * \ \ Merge pull request #373 from fermionic/more-list-fixesfriendica2012-07-052-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 Prezkuta2012-07-052-21/+54
| | | | | | | | | | | | | | | | | | | | non-Markdownify version
| * | | | Merge pull request #374 from fermionic/diaspora-prevent-fcontact-race-conditionsfriendica2012-07-056-23/+181
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / Prevent fcontact race conditions
| | * | final db updates after testingZach Prezkuta2012-07-053-2/+15
| | | |
| | * | cleanup some syntax errors in lock.phpZach Prezkuta2012-07-051-4/+4
| | | |
| | * | "lock" is a reserved MySQL keywordZach Prezkuta2012-07-052-9/+9
| | | |
| | * | minor cleanup in lock.phpZach Prezkuta2012-07-051-0/+2
| | | |
| | * | cleanup obsolete commentsZach Prezkuta2012-07-051-2/+0
| | | |
| | * | add rudimentary locking capability to Friendica functionsZach Prezkuta2012-07-054-21/+166
| |/ /
* / / rev updatefriendica2012-07-052-153/+170
|/ /
* | recycle symbol woes with multiple html entity encode/decode cycles going onfriendica2012-07-041-0/+3
| |
* | render the recycle symbol correctly on Diaspora resharesfriendica2012-07-041-1/+1
| |
* | some initial code and benchmarking for "red" content rendering enginefriendica2012-07-043-0/+866
| |
* | restore translation of bbcode videos, events, bookmarks, etc. to diasporafriendica2012-07-041-10/+27
| |
* | fix !@#$ tinymce linebreaks for the thousandth timefriendica2012-07-046-139/+162
| |
* | add smarty engine, remove some obsolete zot1 stufffriendica2012-07-03139-22/+28796
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-07-035-7/+239
|\ \
| * | Diabook directory wide variants.Thomas Willingham2012-07-045-7/+239
| | |
* | | punycode hostnamefriendica2012-07-032-1/+15
| | |
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-07-039-7/+31
|\| |
| * | Merge pull request #372 from rdc/masterThomas Willingham2012-07-037-7/+7
| |\ \ | | | | | | | | Resolved CSS error in sidebar profile thumbs
| | * | Limiting .directory-photo-wrapper styles to <section> so as not toZvi ben Yaakov (a.k.a rdc)2012-07-037-7/+7
| |/ / | | | | | | | | | interfere with .directory-photo-wrapper in <aside>
| * | Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-lengthfriendica2012-07-022-0/+24
| |\ \ | | | | | | | | add ability to set maximum pixel length of uploaded pictures
| | * | add ability to set maximum pixel length of uploaded picturesZach Prezkuta2012-07-022-0/+24
| |/ /
* / / add link to sharesfriendica2012-07-033-59/+61
|/ /
* | fix diabook directory pages (only the normal style - any volunteers for the ↵friendica2012-07-026-24/+318
| | | | | | | | wide?)
* | fix double linesfriendica2012-07-023-80/+120
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-07-024-7/+57
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/friendicaThomas Willingham2012-07-026-14/+23
| |\ \
| * | | Various theme stuff.Thomas Willingham2012-07-024-7/+57
| | | | | | | | | | | | | | | | | | | | | | | | Profile group list for testbubble Screenshot for facepark Various niggles in darkzero/NS
* | | | try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up ↵friendica2012-07-024-6/+10
| | | | | | | | | | | | | | | | to harder stuff
* | | | "babel" diagnostic - convert bbcode to different formats and back againfriendica2012-07-011-0/+56
| |/ / |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 17:47:07 +0000