Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | Simon L'nu | 2012-04-15 | 15 | -82/+159 | |
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-15 | 0 | -0/+0 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #236 from simonlnu/master | Simon | 2012-04-14 | 6 | -8/+8 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | fix fpostJS, add and fix some other stuff | Simon L'nu | 2012-04-15 | 6 | -8/+8 | |
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-15 | 0 | -0/+0 | |
| |/ / / / / | ||||||
| * | | | | | 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 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | Simon L'nu | 2012-04-14 | 6 | -7/+7 | |
| | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-14 | 7 | -8/+24 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-14 | 0 | -0/+0 | |
| | |/ / / / / | ||||||
* | | | | | | | 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 | Simon L'nu | 2012-04-13 | 1 | -1/+1 | |
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-13 | 0 | -0/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #232 from simonlnu/master | Simon | 2012-04-13 | 14 | -22/+128 | |
|\ \ \ \ | ||||||
| * | | | | neat little changes. hopefully the shadow will be well recieved | Simon L'nu | 2012-04-13 | 14 | -22/+128 | |
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-13 | 74 | -830/+2077 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | 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 | |
|\ \ \ \ \ | ||||||
| * | | | | | diabook-themes: theme-settings: users can set font-size and line-height for p... | tommy tomson | 2012-04-13 | 22 | -31/+628 | |
| * | | | | | Merge pull request #231 from tomtom84/master | tomtom84 | 2012-04-13 | 7 | -10/+209 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | diabook: theme-settings: users can set font-size and line-height for posts an... | tommy tomson | 2012-04-13 | 7 | -10/+209 | |
| |/ / / / / | ||||||
| * | | | | | diabook-themes: small fixes | tommy tomson | 2012-04-13 | 28 | -75/+249 | |
* | | | | | | rev update | friendica | 2012-04-13 | 2 | -511/+579 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #230 from fabrixxm/master | friendica | 2012-04-13 | 22 | -201/+410 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-04-13 | 72 | -10973/+989 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | quattro: language icon in navbar | Fabio Comuni | 2012-04-13 | 7 | -6/+44 | |
| * | | | | | move html out of lang_selector() and new template lang_selector.tpl | Fabio Comuni | 2012-04-13 | 2 | -9/+26 | |
| * | | | | | display settings: show theme screenshot on page load | Fabio Comuni | 2012-04-13 | 1 | -1/+1 | |
| * | | | | | quattro: add admin theme settigs. darker items background with a bottom border. | Fabio Comuni | 2012-04-13 | 8 | -126/+79 | |
| * | | | | | admin: change global theme settings | Fabio Comuni | 2012-04-13 | 3 | -10/+74 | |
| * | | | | | quattro: work on | Fabio Comuni | 2012-04-13 | 9 | -52/+188 | |
| * | | | | | validate_url allow naked subdomain if is "localhost" | Fabio Comuni | 2012-04-13 | 1 | -3/+4 | |
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-13 | 0 | -0/+0 | |
| |/ / / / |/| | | | | ||||||
* | | | | | stray debug statements, forgot to filter pending contacts | friendica | 2012-04-12 | 1 | -5/+5 |