aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | Merge pull request #113 from fabrixxm/masterFriendika2011-06-061-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Small fix to theme selectorfabrixxm2011-06-061-1/+1
| | |/
| * / revupFriendika2011-06-061-1/+1
| |/
| * begin event moduleFriendika2011-06-055-3/+95
| * bug #88, Thanks Chris! Added a couple of minor tweaks for identity checking a...Friendika2011-06-051-2/+11
| * alphabetically sort the language selectorFriendika2011-06-051-0/+1
| * add flag for experimental themesFriendika2011-06-052-1/+2
| * position language selector in dispyFriendika2011-06-051-0/+15
| * use icon for language selector instead of hotkeyFriendika2011-06-055-16/+33
| * more work on facebook re-queueFriendika2011-06-051-1/+5
| * load hooks inside queueFriendika2011-06-052-4/+14
| * fb queue - wrong varFriendika2011-06-051-1/+1
| * mb_string is now required.Friendika2011-06-041-1/+4
| * facebook queue: not enough parametersFriendika2011-06-041-1/+1
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-052-2/+2
|\|
| * mbstring is now requiredFriendika2011-06-042-2/+2
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0310-34/+183
|\|
| * minor editsFriendika2011-06-031-1/+3
| * document newmember link so you can find it later.Friendika2011-06-031-0/+3
| * don't serialize entire itemFriendika2011-06-031-2/+2