aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | use zrl to get home againfriendica2012-03-297-17/+54
| * | Merge branch 'pull'friendica2012-03-296-58/+44
| |\ \
| | * \ Merge pull request #186 from simonlnu/masterSimon2012-03-296-58/+44
| | |\ \
| | | * | tweaking stuff in dispys. i thought i fixed the login screens, but they're b0...Simon L'nu2012-03-296-58/+44
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-292-4/+3
| | | |\ \ | | | |/ / | | |/| |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2931-135/+657
| | | |\|
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-290-0/+0
| * | | | provide a way to specify an admin account for siteinfo if more than one have ...friendica2012-03-291-1/+5
| |/ / /
| * | / typo in function namefriendica2012-03-292-4/+3
| | |/ | |/|
| * | theme file_as combobox for 2.0friendica2012-03-292-1/+8
| * | css fixes in diabook-derivatestommy tomson2012-03-2916-23/+136
| * | Merge pull request #185 from fabrixxm/masterfabrixxm2012-03-2813-111/+513
| |\ \ | | |/ | |/|
| | * quattro: style pm pagesFabio Comuni2012-03-288-64/+405
| | * message: remove tabs, move new message link to aside, all message with gmail-...Fabio Comuni2012-03-284-47/+96
| | * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-2822-130/+316
| | |\
| | * | quattro: tpl for "file as"Fabio Comuni2012-03-281-0/+12
| * | | some reported warnings cleaned upfriendica2012-03-283-8/+11
| * | | Merge branch 'pull'friendica2012-03-2810-78/+317
| |\ \ \
| | * \ \ Merge pull request #184 from annando/masterfriendica2012-03-2810-78/+317
| | |\ \ \
| * | | | | network permission idsfriendica2012-03-281-1/+23
| * | | | | wrong var for notify totalfriendica2012-03-281-1/+1
| * | | | | fix notification totalfriendica2012-03-281-2/+3
| * | | | | improved rw notificationsfriendica2012-03-282-2/+28
| |/ / / /
| * | | | Merge branch 'pull'friendica2012-03-2812-22/+108
| |\ \ \ \
| | * | | | add a searchbox to "find friends" for global searchtommy tomson2012-03-288-9/+70
| | * | | | bugfix in diabooktommy tomson2012-03-285-13/+38
| | | |_|/ | | |/| |
| * / | | bug #349 - email notls settingfriendica2012-03-282-2/+2
| |/ / /
* | / / Several improvementsMichael Vogel2012-03-312-2/+6
| |/ / |/| |
* | | Merge commit 'upstream/master'Michael Vogel2012-03-28598-11992/+36509
|\| |
| * | Merge branch 'pull'friendica2012-03-284-11/+14
| |\ \
| | * \ Merge pull request #183 from simonlnu/masterSimon2012-03-282-12/+4
| | |\ \
| | | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-282-1/+10
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #182 from fabrixxm/masterfabrixxm2012-03-282-1/+10
| | |\ \ \ | | | | |/ | | | |/|
| | | * | viewsrc: return only body if page is requested via ajaxFabio Comuni2012-03-282-1/+10
| | * | | Merge pull request #181 from simonlnu/masterSimon2012-03-282-2/+4
| | |\ \ \
| | | | | * really fix it this time...Simon L'nu2012-03-282-12/+4
| | | | |/ | | | |/|
| | | * | WITH is going on?Simon L'nu2012-03-282-2/+4
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-280-0/+0
| | |/ /
| * | | Merge branch 'pull'friendica2012-03-2828-157/+485
| |\| |
| | * | Merge pull request #180 from simonlnu/masterSimon2012-03-282-11/+13
| | |\ \
| | | * | doh fixSimon L'nu2012-03-282-11/+13
| | * | | Merge pull request #179 from fabrixxm/masterfabrixxm2012-03-288-29/+164
| | |\ \ \ | | | | |/ | | | |/|
| | | * | filer: replace "file as" prompt with combobox opened in fancyboxFabio Comuni2012-03-286-29/+145
| | | * | filer: info() on item filedFabio Comuni2012-03-281-0/+1
| | | * | template: field_comboboxFabio Comuni2012-03-281-0/+18
| | * | | Merge pull request #178 from simonlnu/masterSimon2012-03-2820-130/+321
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * add some icons for the newbie stuff (diabook but 24px not 32); fixes for disp...Simon L'nu2012-03-2820-130/+321
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-280-0/+0
| | |/
| * / title not updated when editing postfriendica2012-03-282-2/+1
| |/
| * support autocomplete @-tags in plaintext modefriendica2012-03-282-0/+4