Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-10 | 4 | -13/+37 |
|\ | |||||
| * | fixed a few feed problems affecting activity objects/targets | Friendika | 2011-06-10 | 4 | -13/+37 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-10 | 6 | -13/+217 |
|\| | |||||
| * | event publish | Friendika | 2011-06-09 | 3 | -10/+92 |
| | | |||||
| * | event item | Friendika | 2011-06-09 | 3 | -4/+78 |
| | | |||||
| * | event communication basics | Friendika | 2011-06-09 | 3 | -2/+50 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-09 | 13 | -56/+149 |
|\| | |||||
| * | default event publish permissions = personal | Friendika | 2011-06-09 | 1 | -0/+3 |
| | | |||||
| * | events | Friendika | 2011-06-09 | 3 | -2/+6 |
| | | |||||
| * | set permalink on photo tags | Friendika | 2011-06-08 | 1 | -1/+8 |
| | | |||||
| * | minor fixes to apps (don't show notes if not logged in) and photos (tag ↵ | Friendika | 2011-06-08 | 2 | -3/+14 |
| | | | | | | | | delete link is leaking to unauthorised users) | ||||
| * | more calendar work, undo strict_privacy flag to use different approach | Friendika | 2011-06-08 | 10 | -51/+119 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-08 | 2 | -3/+16 |
|\| | |||||
| * | remove event if attached item is deleted | Friendika | 2011-06-08 | 1 | -0/+11 |
| | | |||||
| * | default uploaded photo permissions were wrong | Friendika | 2011-06-07 | 1 | -3/+5 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-08 | 17 | -588/+838 |
|\| | |||||
| * | events, continued. Also better regex matching accounting for empty elements | Friendika | 2011-06-07 | 7 | -43/+43 |
| | | |||||
| * | more progress on events | Friendika | 2011-06-07 | 8 | -31/+177 |
| | | |||||
| * | Merge pull request #115 from fabrixxm/tr | Friendika | 2011-06-07 | 3 | -513/+617 |
| |\ | | | | | | | update it strings | ||||
| | * | update it strings | fabrixxm | 2011-06-07 | 2 | -512/+616 |
| | | | |||||
| | * | fix po2php plurals regexp and IT strings.php | fabrixxm | 2011-06-07 | 1 | -1/+1 |
| | | | |||||
| * | | first recently uploaded photo (in 3 hours) to an older existing album, post ↵ | Friendika | 2011-06-07 | 2 | -3/+3 |
| |/ | | | | | | | made visible | ||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-07 | 24 | -57/+426 |
|\| | |||||
| * | basic saving of events | Friendika | 2011-06-06 | 2 | -11/+42 |
| | | |||||
| * | tinymce for event fields | Friendika | 2011-06-06 | 2 | -7/+11 |
| | | |||||
| * | prev/next links in calendar | Friendika | 2011-06-06 | 1 | -1/+17 |
| | | |||||
| * | event listings | Friendika | 2011-06-06 | 4 | -5/+27 |
| | | |||||
| * | more events framework | Friendika | 2011-06-06 | 2 | -3/+105 |
| | | |||||
| * | strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy ↵ | Friendika | 2011-06-06 | 5 | -9/+35 |
| | | | | | | | | issues | ||||
| * | Merge branch 'pull' | Friendika | 2011-06-06 | 5 | -6/+22 |
| |\ | |||||
| | * | Merge pull request #114 from fabrixxm/dispy | Friendika | 2011-06-06 | 4 | -5/+21 |
| | |\ | | | | | | | | | Missing icons in dispy | ||||
| | | * | Add 'attach' and 'language' icons and enable file upload in dispy template | Fabio Comuni | 2011-06-06 | 4 | -5/+21 |
| | | | | |||||
| | * | | Merge pull request #113 from fabrixxm/master | Friendika | 2011-06-06 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | Small fix to theme selector | ||||
| | | * | Small fix to theme selector | fabrixxm | 2011-06-06 | 1 | -1/+1 |
| | |/ | |||||
| * / | revup | Friendika | 2011-06-06 | 1 | -1/+1 |
| |/ | |||||
| * | begin event module | Friendika | 2011-06-05 | 5 | -3/+95 |
| | | |||||
| * | bug #88, Thanks Chris! Added a couple of minor tweaks for identity checking ↵ | Friendika | 2011-06-05 | 1 | -2/+11 |
| | | | | | | | | and consistency with other profile viewing links | ||||
| * | alphabetically sort the language selector | Friendika | 2011-06-05 | 1 | -0/+1 |
| | | |||||
| * | add flag for experimental themes | Friendika | 2011-06-05 | 2 | -1/+2 |
| | | |||||
| * | position language selector in dispy | Friendika | 2011-06-05 | 1 | -0/+15 |
| | | |||||
| * | use icon for language selector instead of hotkey | Friendika | 2011-06-05 | 5 | -16/+33 |
| | | |||||
| * | more work on facebook re-queue | Friendika | 2011-06-05 | 1 | -1/+5 |
| | | |||||
| * | load hooks inside queue | Friendika | 2011-06-05 | 2 | -4/+14 |
| | | |||||
| * | fb queue - wrong var | Friendika | 2011-06-05 | 1 | -1/+1 |
| | | |||||
| * | mb_string is now required. | Friendika | 2011-06-04 | 1 | -1/+4 |
| | | |||||
| * | facebook queue: not enough parameters | Friendika | 2011-06-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-05 | 2 | -2/+2 |
|\| | |||||
| * | mbstring is now required | Friendika | 2011-06-04 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-06-03 | 10 | -34/+183 |
|\| | |||||
| * | minor edits | Friendika | 2011-06-03 | 1 | -1/+3 |
| | |