aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-162-0/+3
|\
| * iframesFriendika2011-06-152-0/+3
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-159-49/+215
|\|
| * preserve original timezone adjust selection when editing eventsFriendika2011-06-142-10/+17
| * add some whitespace in event htmlFriendika2011-06-141-6/+6
| * Dear $username not expanded/replaced in text emailsFriendika2011-06-142-0/+10
| * event themingFriendika2011-06-142-1/+39
| * event calendar links, editingFriendika2011-06-146-43/+148
| * docoFriendika2011-06-131-0/+6
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-1445-134/+363
|\|
| * demo plugin for embedded flash gamesFriendika2011-06-1329-0/+57
| * prev/next icons (instead of text) for photosFriendika2011-06-131-2/+2
| * apps is not an array...Friendika2011-06-131-1/+1
| * avoid returning events from getting posted againFriendika2011-06-133-3/+5
| * link events + personal notes to profile tabsFriendika2011-06-139-18/+87
| * event sharing, cont.Friendika2011-06-137-114/+215
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-113-2/+21
|\|
| * reduce visibility of lang-select flag (duepuntozero)Friendika2011-06-103-2/+21
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-104-13/+37
|\|
| * fixed a few feed problems affecting activity objects/targetsFriendika2011-06-104-13/+37
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-106-13/+217
|\|
| * event publishFriendika2011-06-093-10/+92
| * event itemFriendika2011-06-093-4/+78
| * event communication basicsFriendika2011-06-093-2/+50
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0913-56/+149
|\|
| * default event publish permissions = personalFriendika2011-06-091-0/+3
| * eventsFriendika2011-06-093-2/+6
| * set permalink on photo tagsFriendika2011-06-081-1/+8
| * minor fixes to apps (don't show notes if not logged in) and photos (tag delet...Friendika2011-06-082-3/+14
| * more calendar work, undo strict_privacy flag to use different approachFriendika2011-06-0810-51/+119
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-082-3/+16
|\|
| * remove event if attached item is deletedFriendika2011-06-081-0/+11
| * default uploaded photo permissions were wrongFriendika2011-06-071-3/+5
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0817-588/+838
|\|
| * events, continued. Also better regex matching accounting for empty elementsFriendika2011-06-077-43/+43
| * more progress on eventsFriendika2011-06-078-31/+177
| * Merge pull request #115 from fabrixxm/trFriendika2011-06-073-513/+617
| |\
| | * update it stringsfabrixxm2011-06-072-512/+616
| | * fix po2php plurals regexp and IT strings.phpfabrixxm2011-06-071-1/+1
| * | first recently uploaded photo (in 3 hours) to an older existing album, post m...Friendika2011-06-072-3/+3
| |/
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0724-57/+426
|\|
| * basic saving of eventsFriendika2011-06-062-11/+42
| * tinymce for event fieldsFriendika2011-06-062-7/+11
| * prev/next links in calendarFriendika2011-06-061-1/+17
| * event listingsFriendika2011-06-064-5/+27
| * more events frameworkFriendika2011-06-062-3/+105
| * strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy i...Friendika2011-06-065-9/+35
| * Merge branch 'pull'Friendika2011-06-065-6/+22
| |\
| | * Merge pull request #114 from fabrixxm/dispyFriendika2011-06-064-5/+21
| | |\
| | | * Add 'attach' and 'language' icons and enable file upload in dispy templateFabio Comuni2011-06-064-5/+21