aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add some timeouts to prevent deadlockZach Prezkuta2012-07-052-9/+18
* 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
* 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
| |\
| | * Limiting .directory-photo-wrapper styles to <section> so as not toZvi ben Yaakov (a.k.a rdc)2012-07-037-7/+7
| |/
| * 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 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 w...friendica2012-07-026-24/+318
* 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
* | | try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up ...friendica2012-07-024-6/+10
* | | "babel" diagnostic - convert bbcode to different formats and back againfriendica2012-07-011-0/+56
| |/ |/|
* | ...and the other bitfriendica2012-07-011-1/+1
* | pagination start off by onefriendica2012-07-012-2/+4
* | config to disable email validationfriendica2012-07-015-11/+18
|/
* Merge pull request #369 from rdc/masterfriendica2012-07-013-10/+127
|\
| * Added more profile data and CSS styling to the /directory pageZvi ben Yaakov (a.k.a rdc)2012-07-013-10/+127
* | Merge pull request #370 from mschmitt/masterfriendica2012-07-013-1555/+2127
|\ \
| * | Esperanto -> 100%Martin Schmitt2012-07-013-1555/+2127
|/ /
* / rev updatefriendica2012-06-302-60/+68
|/
* bug #437friendica2012-06-301-0/+8
* restore 'shareable' to feeds after recent feed privacy re-factoringfriendica2012-06-301-1/+1
* advanced profile themingfriendica2012-06-301-1/+6
* Merge https://github.com/friendica/friendica into pullfriendica2012-06-2913-45/+638
|\
| * Merge pull request #368 from fabrixxm/masterfriendica2012-06-2913-45/+638
| |\
| | * quattro: fix Forum widget, hide edit profile linkFabrixxm2012-06-293-3/+11
| | * quattro: some updatesFabrixxm2012-06-2912-45/+629
| | * nav: pass $baseurl to templateFabrixxm2012-06-291-0/+1
| |/
* / convert ent_quotes for jquery calendar title/summaryfriendica2012-06-293-69/+69
|/
* maintain page position when hovering on pop-outsfriendica2012-06-281-0/+7
* more pager limitsfriendica2012-06-281-0/+2
* wrong column name (- vs _)friendica2012-06-281-1/+1
* undefined fnfriendica2012-06-281-2/+2