| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 1 | -1/+1 |
| |\ | |||||
| | * | revup | friendica | 2015-01-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into trinidad | friendica | 2015-01-01 | 1006 | -153/+499332 |
| |\| | |||||
| | * | Merge pull request #800 from pafcu/lang | RedMatrix | 2015-01-01 | 1000 | -7/+499188 |
| | |\ | | | | | | | Language names | ||||
| | | * | Add missing vendor/-directory (due to upstream .gitignore) | Stefan Parviainen | 2014-12-31 | 7 | -1/+472 |
| | | | | |||||
| | | * | Revert "Revert "Language names via intl library."" | Stefan Parviainen | 2014-12-31 | 994 | -7/+498717 |
| | | | | | | | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094. | ||||
| | * | | Merge pull request #802 from friendica/revert-792-cssrefactor | pafcu | 2014-12-31 | 6 | -146/+144 |
| | |\ \ | | | | | | | | | Revert "Make redbasic css more modular" | ||||
| | | * | | Revert "Make redbasic css more modular" | pafcu | 2014-12-31 | 6 | -146/+144 |
| | |/ / | |||||
| | * | | Merge pull request #801 from friendica/revert-799-cssrefactor | pafcu | 2014-12-31 | 2 | -41/+39 |
| | |\ \ | | |/ | |/| | Revert "Move mod_profiles.css content back into style.css, since it cont... | ||||
| | | * | Revert "Move mod_profiles.css content back into style.css, since it contains ↵ | pafcu | 2014-12-31 | 2 | -41/+39 |
| | |/ | | | | | | | var..." | ||||
| | * | Merge pull request #799 from pafcu/cssrefactor | pafcu | 2014-12-31 | 2 | -39/+41 |
| | |\ | | | | | | | Move mod_profiles.css content back into style.css, since it contains var... | ||||
| | | * | Move mod_profiles.css content back into style.css, since it contains variables | Stefan Parviainen | 2014-12-31 | 2 | -39/+41 |
| | | | | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2014-12-30 | 994 | -498717/+7 |
| |\| | | |||||
| | * | | Merge pull request #798 from friendica/revert-794-lang | RedMatrix | 2014-12-31 | 994 | -498717/+7 |
| | |\ \ | | | | | | | | | Revert "Language names via intl library." | ||||
| | | * | | Revert "Language names via intl library." | RedMatrix | 2014-12-31 | 994 | -498717/+7 |
| | |/ / | |||||
| * | | | Merge branch 'master' into trinidad | friendica | 2014-12-30 | 1036 | -514/+499133 |
| |\| | | |||||
| | * | | Merge pull request #797 from anaqreon/imagelink | RedMatrix | 2014-12-31 | 6 | -116/+163 |
| | |\ \ | | | | | | | | | Imagelink | ||||
| | | * | | Added url tag around image for inserted links | Andrew Manning | 2014-12-30 | 6 | -116/+163 |
| | | | | | |||||
| | | * | | Merge pull request #1 from friendica/master | anaqreon | 2014-12-30 | 471 | -23780/+36276 |
| | | |\ \ | | | | | | | | | | | Pull from upstream | ||||
| | * | \ \ | Merge pull request #796 from pafcu/profeditfix | RedMatrix | 2014-12-31 | 1 | -1/+4 |
| | |\ \ \ \ | | | | | | | | | | | | | Don't show links to edit alternate profiles if multi_profiles is disable... | ||||
| | | * | | | | Don't show links to edit alternate profiles if multi_profiles is disabled | Stefan Parviainen | 2014-12-30 | 1 | -1/+4 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #795 from pafcu/tplcleanup | RedMatrix | 2014-12-31 | 17 | -201/+0 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Remove some old, unused templates | ||||
| | | * | | | | | Remove some old, unused templates | Stefan Parviainen | 2014-12-30 | 17 | -201/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #794 from pafcu/lang | RedMatrix | 2014-12-31 | 994 | -7/+498717 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Language names via intl library. | ||||
| | | * | | | | | | Update function doc, return language code if language is not recognized | Stefan Parviainen | 2014-12-30 | 1 | -3/+7 |
| | | | | | | | | | |||||
| | | * | | | | | | Language names via intl library. Fixes #773 | Stefan Parviainen | 2014-12-30 | 994 | -5/+498711 |
| | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | | Merge pull request #791 from pafcu/notifications | RedMatrix | 2014-12-31 | 4 | -2/+36 |
| | |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | Improved notifications | ||||
| | | * | | | | | Make showing wall posts, intros and private messages under Notices optional | Stefan Parviainen | 2014-12-30 | 3 | -2/+22 |
| | | | | | | | | |||||
| | | * | | | | | Show some notification badges in red to indicate they are about you | Stefan Parviainen | 2014-12-29 | 1 | -0/+14 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #792 from pafcu/cssrefactor | pafcu | 2014-12-30 | 6 | -144/+146 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | Make redbasic css more modular | ||||
| | | * | | | | | Make redbasic css more modular | Stefan Parviainen | 2014-12-30 | 6 | -144/+146 |
| | | | |_|/ / | | |/| | | | |||||
| | * | | | | | Merge pull request #793 from pafcu/filestorageurlfix | pafcu | 2014-12-30 | 1 | -1/+5 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Encode URL offered in filestorage. Fixes #780 | ||||
| | | * | | | | | Encode URL offered in filestorage. Fixes #780 | Stefan Parviainen | 2014-12-30 | 1 | -1/+5 |
| | | | |_|/ / | | |/| | | | |||||
| | * | | | | | Merge pull request #790 from pafcu/sortnotifications | pafcu | 2014-12-30 | 1 | -2/+2 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Sort notifications | ||||
| | | * | | | | | Sort notifications | Stefan Parviainen | 2014-12-30 | 1 | -2/+2 |
| | | |/ / / / | |||||
| | * / / / / | design fixes for photos, files and random fixes | marijus | 2014-12-30 | 3 | -33/+51 |
| | |/ / / / | |||||
| | * | | | | fix recursive file permissions | marijus | 2014-12-30 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | css fixes | marijus | 2014-12-30 | 4 | -7/+9 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into trinidad | friendica | 2014-12-29 | 30 | -4703/+4766 |
| |\| | | | | |||||
| | * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-29 | 15 | -4624/+4621 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge pull request #789 from pafcu/chanman | RedMatrix | 2014-12-30 | 4 | -35/+14 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Don't show current channel separately in channel manager, highlight it i... | ||||
| | | | * | | | | Don't show current channel separately in channel manager, highlight it instead | Stefan Parviainen | 2014-12-29 | 4 | -35/+14 |
| | | | | | | | | |||||
| | | * | | | | | Merge pull request #787 from pafcu/mainjsfix | RedMatrix | 2014-12-30 | 1 | -5/+5 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Only call autotime() on the correct elements | ||||
| | | | * | | | | | Only call autotime() on the correct elements | Stefan Parviainen | 2014-12-29 | 1 | -5/+5 |
| | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | | Merge pull request #786 from f03el/master | RedMatrix | 2014-12-30 | 1 | -5/+13 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Don't trim escaped quotes | ||||
| | | | * | | | | | Don't trim escaped quotes | Erik Lundin | 2014-12-29 | 1 | -5/+13 |
| | | | | | | | | | |||||
| | | * | | | | | | some work on cloud actionspanel and minor cleanup | marijus | 2014-12-29 | 5 | -30/+15 |
| | | | | | | | | | |||||
| | | * | | | | | | css fixes and remove sloppy photos setting since it is not supported anymore ↵ | marijus | 2014-12-29 | 2 | -5/+3 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | in redbasic | ||||
| | | * | | / / | Remove link to hubloc status in admin panel. This is a potentially useful tool, | Thomas Willingham | 2014-12-29 | 1 | -1/+0 |
| | | | |_|/ / | | |/| | | | | | | | | | | | | | | | but plain doesn't work at the moment. | ||||
| | | * | | | | Merge pull request #784 from tuscanhobbit/dev | Paolo T | 2014-12-29 | 2 | -4543/+4571 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Italian localization | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |