| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-25 | 6 | -1307/+1332 |
|\ |
|
| * | Merge pull request #285 from tobiasd/de20140125 | tobiasd | 2014-01-24 | 2 | -1302/+1309 |
| |\ |
|
| | * | DE: update to the strings | Tobias Diekershoff | 2014-01-25 | 2 | -1302/+1309 |
| |/ |
|
| * | Merge pull request #283 from beardy-unixer/master | friendica | 2014-01-24 | 4 | -5/+23 |
| |\ |
|
| | * | Left over line from placeholder. | Thomas Willingham | 2014-01-25 | 1 | -1/+0 |
| | * | Add admin info to admin panel and site info. | Thomas Willingham | 2014-01-24 | 4 | -5/+24 |
| |/ |
|
* / | get rid of bootstrap's blockqote margin css which is just bloody wrong and ca... | friendica | 2014-01-25 | 3 | -2/+3 |
|/ |
|
* | prettyphoto (js|css) not found | friendica | 2014-01-24 | 49 | -259/+413 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-23 | 1 | -2/+3 |
|\ |
|
| * | Ooops, included site specific hack | Thomas Willingham | 2014-01-24 | 1 | -6/+0 |
| * | Make share previews a bit longer. We can't go any longer than this | Thomas Willingham | 2014-01-24 | 1 | -2/+9 |
* | | add zid to audio/video (again) | friendica | 2014-01-23 | 2 | -13/+50 |
|/ |
|
* | display a somewhat more pleasant hovertip on qr codes | friendica | 2014-01-23 | 1 | -1/+1 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-23 | 44 | -411/+0 |
|\ |
|
| * | Merge pull request #281 from beardy-unixer/master | friendica | 2014-01-23 | 44 | -411/+0 |
| |\ |
|
| | * | Nobody seems to be using that anymore | Thomas Willingham | 2014-01-23 | 44 | -411/+0 |
* | | | fix marital partner linking | friendica | 2014-01-23 | 2 | -26/+24 |
|/ / |
|
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-23 | 1 | -1/+1 |
|\ \ |
|
| * | | the bootstrap theme is obsolete, use clean instead | tobiasd | 2014-01-23 | 1 | -1/+1 |
* | | | mod_profperm migrated | friendica | 2014-01-23 | 4 | -519/+527 |
|/ / |
|
* | | missing filename in uploaded photos (we don't really use this, but we will ne... | friendica | 2014-01-22 | 2 | -1/+2 |
* | | fix api/red/photos when supplied with an album name | friendica | 2014-01-22 | 1 | -1/+1 |
* | | API: provide a link to photo albums in api/red/albums | friendica | 2014-01-22 | 1 | -1/+5 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-22 | 2 | -7/+10 |
|\| |
|
| * | Merge pull request #279 from git-marijus/master | friendica | 2014-01-22 | 2 | -5/+5 |
| |\ |
|
| | * | update argument ?f= | marijus | 2014-01-22 | 1 | -2/+2 |
| | * | make network tabs regard selected group (collection) and vice versa | marijus | 2014-01-22 | 2 | -4/+4 |
| * | | Merge pull request #280 from beardy-unixer/master | friendica | 2014-01-22 | 1 | -2/+5 |
| |\ \
| | |/
| |/| |
|
| | * | Give pages enough to construct a share button. | Thomas Willingham | 2014-01-22 | 1 | -2/+5 |
| |/ |
|
* / | try to reduce the number of simulaneous deliveries of the same post when deal... | friendica | 2014-01-22 | 2 | -15/+42 |
|/ |
|
* | simplify chanview authentication and make sure it carries through multiple ge... | friendica | 2014-01-22 | 2 | -9/+5 |
* | remove debugging | friendica | 2014-01-21 | 1 | -1/+0 |
* | fix location of string file in Translations.md, fix some permissions and owne... | friendica | 2014-01-21 | 3 | -18/+28 |
* | seems you can't easily have a blank password for DAV guests, so the guest pas... | friendica | 2014-01-21 | 2 | -2/+10 |
* | text - change remove account button to remove channel | friendica | 2014-01-21 | 1 | -1/+1 |
* | add primary webbie to directory popup | friendica | 2014-01-21 | 3 | -0/+6 |
* | push new messages.po | friendica | 2014-01-21 | 2 | -86/+84 |
* | add the quota and volume size code | friendica | 2014-01-21 | 1 | -1/+29 |
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-21 | 1 | -1/+1 |
|\ |
|
| * | Merge pull request #278 from zzottel/master | friendica | 2014-01-21 | 1 | -1/+1 |
| |\ |
|
| | * | added feed2red.pl | zottel | 2014-01-21 | 1 | -1/+1 |
* | | | fix the admin interface to pending registrations | friendica | 2014-01-21 | 3 | -6/+5 |
|/ / |
|
* | | sql error | friendica | 2014-01-21 | 1 | -1/+1 |
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-21 | 3 | -1/+12 |
|\ \ |
|
| * \ | Merge pull request #277 from git-marijus/master | friendica | 2014-01-20 | 1 | -1/+1 |
| |\ \
| | |/
| |/| |
|
| | * | lighttpd sample conf update | marijus | 2014-01-21 | 1 | -1/+1 |
| |/ |
|
| * | Nginx conf update | Thomas Willingham | 2014-01-21 | 1 | -0/+8 |
| * | Debian install script doco | Thomas Willingham | 2014-01-21 | 1 | -0/+3 |
* | | move some store things | friendica | 2014-01-21 | 4 | -3/+9 |
* | | create store directory if it's missing before initialising DAV | friendica | 2014-01-21 | 1 | -1/+4 |
|/ |
|