aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-06-1659-883/+1003
|\
| * directory search by hubfriendica2013-06-161-1/+3
| * hopefully this won't screw up everything - if it does, revert. Otherwise this...friendica2013-06-162-23/+31
| * flag taggable connections in acl selectorfriendica2013-06-165-17/+18
| * don't federate webpages ;-)friendica2013-06-151-0/+6
| * fix "new connection has less permissions than public"friendica2013-06-151-4/+12
| * hijack the #getzot tagfriendica2013-06-151-9/+17
| * silence a pointless warningfriendica2013-06-152-2/+2
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-141-0/+85
| |\
| | * Merge pull request #57 from git-marijus/patch-1Thomas Willingham2013-06-141-30/+33
| | |\
| | | * beautify codegit-marijus2013-06-141-30/+33
| | |/
| | * Lighttpd sample configThomas Willingham2013-06-141-0/+82
| * | push refresh messages, performance work on conversations and configs, doc upd...friendica2013-06-1437-327/+398
| |/
| * possibly fix skipped pages on endless scrollfriendica2013-06-131-6/+15
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-131-0/+29
| |\
| | * Nginx config - add an index in case they don't have a http blockThomas Willingham2013-06-131-0/+1
| | * Add sample nginx conf in doc/install - we'll keep configs and trouble shootin...Thomas Willingham2013-06-131-0/+28
| * | missing includefriendica2013-06-132-1/+2
| |/
| * feeds are bit more standards compliant and a bit less broken nowfriendica2013-06-123-60/+52
| * very minimal Atom feed - there will be a lot of bugs and unparseable content ...friendica2013-06-121-192/+64
| * missed a few zrl/zmg conversions, like for translate_item and enotify messagesfriendica2013-06-123-27/+28
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-093-0/+6
| |\
| | * Another missing includeThomas Willingham2013-06-091-0/+1
| | * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2013-06-0912-261/+278
| | |\
| | * | Quick fix for PCSS until the cleaned up version is finished.Thomas Willingham2013-06-092-0/+5
| * | | rev updatefriendica2013-06-091-1/+1
| | |/ | |/|
| * | import requires a valid accountfriendica2013-06-081-0/+7
| * | Merge https://github.com/friendica/red into zpullfriendica2013-06-083-6/+10
| |\|
| | * Rename newmessage widget (since we'll need to put more stuff in it as we make...Thomas Willingham2013-06-072-6/+9
| | * Another missing includeThomas Willingham2013-06-071-0/+1
| * | remove uploaded import file once we're done with it.friendica2013-06-0812-261/+271
| |/
* | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-06-0782-691/+1154
|\|
| * by default pending connections have no rightsfriendica2013-06-061-2/+2
| * no GMT_TIMESTAMP() in mysql - use UTC_TIMESTAMP() insteadfriendica2013-06-062-2/+2
| * photo album listing widget brokenfriendica2013-06-052-4/+4
| * set default channel to new import if a default channel wasn't already setfriendica2013-06-051-0/+2
| * missing include, plus change to new red api path for basic exportfriendica2013-06-051-2/+2
| * doh - would probably help to decode the data before trying to use it...friendica2013-06-052-1/+2
| * This should get community tagging pretty close to working - deleting a commun...friendica2013-06-042-6/+36
| * tagging posts now sends out a presumably legal activity message - all that's ...friendica2013-06-042-68/+23
| * DB: add timestamps to hubloc table so we can eventually expire dead entries.friendica2013-06-043-4/+18
| * community tagging - it's not much closer to working but a really good develop...friendica2013-06-043-64/+61
| * fix buggered contact photosfriendica2013-06-033-1/+32
| * syntax errorfriendica2013-06-031-1/+1
| * templatise alt_pagerfriendica2013-06-034-15/+15
| * move oohembed service to addonfriendica2013-06-031-5/+10
| * quick and dirty (real dirty) template docofriendica2013-06-033-0/+223
| * Merge https://github.com/friendica/red into zpullfriendica2013-06-034-13/+45
| |\
| | * Make a start at making mail look less dreadful.Thomas Willingham2013-06-022-1/+39
| | * TypoThomas Willingham2013-06-021-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 08:38:42 +0000