| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #238 from annando/master | friendica | 2012-04-15 | 7 | -67/+259 |
| |\ | | | | | API: Support of the statusnet application | ||||
| | * | DBA: Reverting back to original source | Michael Vogel | 2012-04-14 | 1 | -3/+1 |
| | | | |||||
| | * | DBA: Nothing really done .. | Michael Vogel | 2012-04-14 | 1 | -71/+0 |
| | | | |||||
| | * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 98 | -911/+2464 |
| | |\ | |||||
| | * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 88 | -12005/+2087 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php | ||||
| | * | | | DBA: Deactivation of the mysqli-class for testing purposes. | Michael Vogel | 2012-04-13 | 1 | -30/+31 |
| | | | | | |||||
| | * | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 133 | -1946/+2921 |
| | |\ \ \ | |||||
| | * | | | | API: Improved the timeline. Several (disabled) tests with caching of photos. | Michael Vogel | 2012-04-11 | 4 | -8/+42 |
| | | | | | | |||||
| | * | | | | html2plain: changed behaviour for the "hr" element. | Michael Vogel | 2012-04-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | API: Tweetdeck is now working | Michael Vogel | 2012-04-09 | 2 | -54/+51 |
| | | | | | | |||||
| | * | | | | API: Added Public Timeline | Michael Vogel | 2012-04-08 | 1 | -5/+85 |
| | | | | | | |||||
| | * | | | | API: Now mentions could work as well - only my client doesn't really work | Michael Vogel | 2012-04-08 | 1 | -61/+72 |
| | | | | | | |||||
| | * | | | | API: Basic support of the identica client added. | Michael Vogel | 2012-04-08 | 1 | -0/+72 |
| | | | | | | |||||
| * | | | | | diabook-themes: css-fixes | tommy tomson | 2012-04-15 | 17 | -24/+88 |
| | | | | | | |||||
| * | | | | | open contact edit in same window | friendica | 2012-04-15 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | where did this "lang" string come from and why? | friendica | 2012-04-15 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-15 | 153 | -112/+8559 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge pull request #237 from simonlnu/master | Simon | 2012-04-15 | 15 | -82/+159 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | REALLY fix fpostit this time | ||||
| | | * | | | | | REALLY fix fpostit this time | Simon L'nu | 2012-04-15 | 15 | -82/+159 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-15 | 0 | -0/+0 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | | | | | Merge pull request #236 from simonlnu/master | Simon | 2012-04-14 | 6 | -8/+8 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | fix fpostJS, add and fix some other stuff | ||||
| | | * | | | | | fix fpostJS, add and fix some other stuff | Simon L'nu | 2012-04-15 | 6 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-15 | 0 | -0/+0 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: added js for auto-growing comment-textareas diabook: theme-settings: add a wide-option Another bunch of executable permission removal Removed execution permission: lintian warning in Debian packaging * master: | ||||
| | * | | | | | diabook-themes: added js for auto-growing comment-textareas | tommy tomson | 2012-04-15 | 12 | -4/+238 |
| | | | | | | | |||||
| | * | | | | | diabook: theme-settings: add a wide-option | tommy tomson | 2012-04-15 | 43 | -11/+8147 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #234 from copyninja/master | friendica | 2012-04-14 | 153 | -0/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Executable permisson removal on files which are not elf/script | ||||
| | | * | | | | | Another bunch of executable permission removal | Vasudev Kamath | 2012-04-14 | 121 | -0/+0 |
| | | | | | | | | |||||
| | | * | | | | | Removed execution permission: lintian warning in Debian packaging | Vasudev Kamath | 2012-04-14 | 32 | -0/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #235 from simonlnu/master | Simon | 2012-04-14 | 6 | -7/+7 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | string fix: typo. slow down scroll to top in dispys | ||||
| | | * | | | | | | string fix: typo. slow down scroll to top in dispys | Simon L'nu | 2012-04-14 | 6 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-14 | 7 | -8/+24 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bogus empty list element in dfrn_request page when emailnet not enabled zrl on random profile zrl hook bug #372 - category feeds pass zrl's to/through global directory * master: | ||||
| | | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-14 | 0 | -0/+0 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: one more additional marital status selectors * master: | ||||
| * | | | | | | | function name typo | friendica | 2012-04-15 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | track requested profile error msg | friendica | 2012-04-14 | 3 | -17/+62 |
| |/ / / / / / | |||||
| * | | | | | | bogus empty list element in dfrn_request page when emailnet not enabled | friendica | 2012-04-14 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | zrl on random profile | friendica | 2012-04-14 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | zrl hook | friendica | 2012-04-14 | 1 | -2/+6 |
| | | | | | | | |||||
| * | | | | | | bug #372 - category feeds | friendica | 2012-04-14 | 1 | -0/+10 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | pass zrl's to/through global directory | friendica | 2012-04-14 | 2 | -3/+5 |
| |/ / / / | |||||
| * | | | | one more | friendica | 2012-04-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | additional marital status selectors | friendica | 2012-04-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #233 from simonlnu/master | Simon | 2012-04-13 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | lighten wrapper shadow a bit on dispy | ||||
| | * | | | | lighten wrapper shadow a bit on dispy | Simon L'nu | 2012-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-13 | 0 | -0/+0 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| * | | | | Merge pull request #232 from simonlnu/master | Simon | 2012-04-13 | 14 | -22/+128 |
| |\ \ \ \ | | | | | | | | | | | neat little changes. hopefully the shadow will be well recieved | ||||
| | * | | | | neat little changes. hopefully the shadow will be well recieved | Simon L'nu | 2012-04-13 | 14 | -22/+128 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-13 | 74 | -830/+2077 |
| | |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: well that was a silly mistake... setting wasn't being applied rev update diabook-themes: theme-settings: users can set font-size and line-height for posts and comments diabook: theme-settings: users can set font-size and line-height for posts and comments diabook-themes: small fixes quattro: language icon in navbar move html out of lang_selector() and new template lang_selector.tpl display settings: show theme screenshot on page load quattro: add admin theme settigs. darker items background with a bottom border. admin: change global theme settings quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot validate_url allow naked subdomain if is "localhost" * master: | ||||
| * | | | | | well that was a silly mistake... | friendica | 2012-04-13 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | setting wasn't being applied | friendica | 2012-04-13 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-13 | 48 | -115/+1085 |
| |\ \ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |