Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | use zrl to get home again | friendica | 2012-03-29 | 7 | -17/+54 | |
| * | | Merge branch 'pull' | friendica | 2012-03-29 | 6 | -58/+44 | |
| |\ \ | ||||||
| | * \ | Merge pull request #186 from simonlnu/master | Simon | 2012-03-29 | 6 | -58/+44 | |
| | |\ \ | ||||||
| | | * | | tweaking stuff in dispys. i thought i fixed the login screens, but they're b0... | Simon L'nu | 2012-03-29 | 6 | -58/+44 | |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 2 | -4/+3 | |
| | | |\ \ | | | |/ / | | |/| | | ||||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 31 | -135/+657 | |
| | | |\| | ||||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-29 | 0 | -0/+0 | |
| * | | | | provide a way to specify an admin account for siteinfo if more than one have ... | friendica | 2012-03-29 | 1 | -1/+5 | |
| |/ / / | ||||||
| * | / | typo in function name | friendica | 2012-03-29 | 2 | -4/+3 | |
| | |/ | |/| | ||||||
| * | | theme file_as combobox for 2.0 | friendica | 2012-03-29 | 2 | -1/+8 | |
| * | | css fixes in diabook-derivates | tommy tomson | 2012-03-29 | 16 | -23/+136 | |
| * | | Merge pull request #185 from fabrixxm/master | fabrixxm | 2012-03-28 | 13 | -111/+513 | |
| |\ \ | | |/ | |/| | ||||||
| | * | quattro: style pm pages | Fabio Comuni | 2012-03-28 | 8 | -64/+405 | |
| | * | message: remove tabs, move new message link to aside, all message with gmail-... | Fabio Comuni | 2012-03-28 | 4 | -47/+96 | |
| | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-28 | 22 | -130/+316 | |
| | |\ | ||||||
| | * | | quattro: tpl for "file as" | Fabio Comuni | 2012-03-28 | 1 | -0/+12 | |
| * | | | some reported warnings cleaned up | friendica | 2012-03-28 | 3 | -8/+11 | |
| * | | | Merge branch 'pull' | friendica | 2012-03-28 | 10 | -78/+317 | |
| |\ \ \ | ||||||
| | * \ \ | Merge pull request #184 from annando/master | friendica | 2012-03-28 | 10 | -78/+317 | |
| | |\ \ \ | ||||||
| * | | | | | network permission ids | friendica | 2012-03-28 | 1 | -1/+23 | |
| * | | | | | wrong var for notify total | friendica | 2012-03-28 | 1 | -1/+1 | |
| * | | | | | fix notification total | friendica | 2012-03-28 | 1 | -2/+3 | |
| * | | | | | improved rw notifications | friendica | 2012-03-28 | 2 | -2/+28 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'pull' | friendica | 2012-03-28 | 12 | -22/+108 | |
| |\ \ \ \ | ||||||
| | * | | | | add a searchbox to "find friends" for global search | tommy tomson | 2012-03-28 | 8 | -9/+70 | |
| | * | | | | bugfix in diabook | tommy tomson | 2012-03-28 | 5 | -13/+38 | |
| | | |_|/ | | |/| | | ||||||
| * / | | | bug #349 - email notls setting | friendica | 2012-03-28 | 2 | -2/+2 | |
| |/ / / | ||||||
* | / / | Several improvements | Michael Vogel | 2012-03-31 | 2 | -2/+6 | |
| |/ / |/| | | ||||||
* | | | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 598 | -11992/+36509 | |
|\| | | ||||||
| * | | Merge branch 'pull' | friendica | 2012-03-28 | 4 | -11/+14 | |
| |\ \ | ||||||
| | * \ | Merge pull request #183 from simonlnu/master | Simon | 2012-03-28 | 2 | -12/+4 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-28 | 2 | -1/+10 | |
| | | |\ \ | | | |/ / | | |/| | | ||||||
| | * | | | Merge pull request #182 from fabrixxm/master | fabrixxm | 2012-03-28 | 2 | -1/+10 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | * | | viewsrc: return only body if page is requested via ajax | Fabio Comuni | 2012-03-28 | 2 | -1/+10 | |
| | * | | | Merge pull request #181 from simonlnu/master | Simon | 2012-03-28 | 2 | -2/+4 | |
| | |\ \ \ | ||||||
| | | | | * | really fix it this time... | Simon L'nu | 2012-03-28 | 2 | -12/+4 | |
| | | | |/ | | | |/| | ||||||
| | | * | | WITH is going on? | Simon L'nu | 2012-03-28 | 2 | -2/+4 | |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-28 | 0 | -0/+0 | |
| | |/ / | ||||||
| * | | | Merge branch 'pull' | friendica | 2012-03-28 | 28 | -157/+485 | |
| |\| | | ||||||
| | * | | Merge pull request #180 from simonlnu/master | Simon | 2012-03-28 | 2 | -11/+13 | |
| | |\ \ | ||||||
| | | * | | doh fix | Simon L'nu | 2012-03-28 | 2 | -11/+13 | |
| | * | | | Merge pull request #179 from fabrixxm/master | fabrixxm | 2012-03-28 | 8 | -29/+164 | |
| | |\ \ \ | | | | |/ | | | |/| | ||||||
| | | * | | filer: replace "file as" prompt with combobox opened in fancybox | Fabio Comuni | 2012-03-28 | 6 | -29/+145 | |
| | | * | | filer: info() on item filed | Fabio Comuni | 2012-03-28 | 1 | -0/+1 | |
| | | * | | template: field_combobox | Fabio Comuni | 2012-03-28 | 1 | -0/+18 | |
| | * | | | Merge pull request #178 from simonlnu/master | Simon | 2012-03-28 | 20 | -130/+321 | |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | ||||||
| | | * | add some icons for the newbie stuff (diabook but 24px not 32); fixes for disp... | Simon L'nu | 2012-03-28 | 20 | -130/+321 | |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-28 | 0 | -0/+0 | |
| | |/ | ||||||
| * / | title not updated when editing post | friendica | 2012-03-28 | 2 | -2/+1 | |
| |/ | ||||||
| * | support autocomplete @-tags in plaintext mode | friendica | 2012-03-28 | 2 | -0/+4 |