| Commit message (Expand) | Author | Age | Files | Lines |
* | more work on json notifications, now working except for notify popup | friendica | 2012-07-15 | 3 | -3/+3 |
* | updates | friendica | 2012-07-14 | 1 | -0/+25 |
* | merge upstream, slider work, refactor ping module, language selection work | friendica | 2012-07-13 | 5 | -35/+204 |
* | add plink to profile change notifications | friendica | 2012-07-12 | 1 | -3/+2 |
* | language detection and sparkle links added to plinks where appropriate | friendica | 2012-07-12 | 2 | -0/+13 |
* | get rid of special "short salmon key" for statusnet | friendica | 2012-07-11 | 5 | -31/+12 |
* | gracefully recover from datetime constructor issues | friendica | 2012-07-11 | 1 | -2/+23 |
* | catchup | friendica | 2012-07-11 | 2 | -30/+66 |
* | catchup | friendica | 2012-07-10 | 1 | -1/+1 |
* | create fetch_tags function, make search work again, change logo | friendica | 2012-07-10 | 4 | -20/+37 |
* | upstream fixes and a lot of taxonomy stuff | friendica | 2012-07-10 | 6 | -12/+16 |
* | slider | friendica | 2012-07-09 | 418 | -0/+69027 |
* | theme cleanup | friendica | 2012-07-09 | 1 | -1/+1 |
* | making tags work | friendica | 2012-07-09 | 4 | -61/+111 |
* | remove bookmark content flag | friendica | 2012-07-08 | 1 | -8/+0 |
* | cleanup | Zach Prezkuta | 2012-07-07 | 1 | -5/+0 |
* | fix bugs | Zach Prezkuta | 2012-07-07 | 3 | -13/+20 |
* | allow more than one embedded private photo | Zach Prezkuta | 2012-07-07 | 3 | -119/+253 |
* | 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, since it's not required to create an event | Zach Prezkuta | 2012-07-06 | 1 | -1/+1 |
* | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-07-06 | 32 | -351/+3899 |
|\| |
|
| * | remove obsolete zot encapsulation functions | friendica | 2012-07-05 | 1 | -33/+0 |
| * | my php thinks this is a typo | Zach Prezkuta | 2012-07-05 | 1 | -1/+1 |
| * | 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 |
| * | | 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 |
| * | | 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 | 1 | -6/+6 |
| * | | 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 | 3 | -21/+154 |
| |/ |
|
| * | 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 | 1 | -0/+6 |
| * | 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 | 2 | -2/+1 |
| * | punycode hostname | friendica | 2012-07-03 | 1 | -0/+14 |
| * | fix double lines | friendica | 2012-07-02 | 1 | -1/+5 |
| * | try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up ... | friendica | 2012-07-02 | 3 | -4/+8 |
| * | config to disable email validation | friendica | 2012-07-01 | 3 | -2/+9 |
| * | restore 'shareable' to feeds after recent feed privacy re-factoring | friendica | 2012-06-30 | 1 | -1/+1 |
| * | nav: pass $baseurl to template | Fabrixxm | 2012-06-29 | 1 | -0/+1 |
| * | wrong column name (- vs _) | friendica | 2012-06-28 | 1 | -1/+1 |
| * | remote_self feeds are not private | friendica | 2012-06-28 | 1 | -1/+5 |
| * | create third privacy state - public post but not searchable or publicly visible | friendica | 2012-06-28 | 5 | -16/+17 |