Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-24 | 52 | -972/+605 |
|\ | | | | | | | to be in sync with master repro | ||||
| * | 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 |
| | | | | | | | | | | | | | | | | | | without suhosin starting to break things for channels with long names - this limit works with the channel with the longest name in the matrix today, but we may need to make this a pconfig anyway. | ||||
| * | | 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 |
| | |\ | | | | | | | | | Kill prettyphoto | ||||
| | | * | 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 |
| |\ \ | |||||
| * | | | mod_profperm migrated | friendica | 2014-01-23 | 4 | -519/+527 |
| | | | | |||||
* | | | | build url, deleted logger commands | Michael Meer | 2014-01-23 | 1 | -4/+3 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-23 | 3 | -2/+3 |
|\ \ \ \ | | |/ / | |/| | | | | | | to be in sync with main repro | ||||
| * | | | the bootstrap theme is obsolete, use clean instead | tobiasd | 2014-01-23 | 1 | -1/+1 |
| |/ / | |||||
| * | | missing filename in uploaded photos (we don't really use this, but we will ↵ | friendica | 2014-01-22 | 2 | -1/+2 |
| | | | | | | | | | | | | need to have a filename to export via DAV or API and the original filename would be the most likely choice). | ||||
* | | | preperation for ping, need training in SQL :( | Michael Meer | 2014-01-23 | 1 | -1/+6 |
| | | | |||||
* | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-23 | 6 | -24/+58 |
|\| | | | | | | | | | | | to be in sync with main repro | ||||
| * | | 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 |
| | |\ | | | | | | | | | make network tabs regard selected group (collection) and vice versa | ||||
| | | * | 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. | ||||
| | | * | 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 ↵ | friendica | 2014-01-22 | 2 | -15/+42 |
| |/ | | | | | | | dealing with owner relays that have more than one channel instance. If things melt down in the next few hours and I'm not available please revert this. I've reviewed a few times and think it's OK, but this part of the delivery code is traditionally touchy. | ||||
* | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-22 | 2 | -9/+5 |
|\| | | | | | | | to keep the repros in sync | ||||
| * | simplify chanview authentication and make sure it carries through multiple ↵ | friendica | 2014-01-22 | 2 | -9/+5 |
| | | | | | | | | generations | ||||
* | | reorg formula data for hubloc checks | Michael Meer | 2014-01-22 | 2 | -5/+15 |
| | | |||||
* | | start with hubloc ping | Michael Meer | 2014-01-22 | 1 | -0/+9 |
|/ | |||||
* | remove debugging | friendica | 2014-01-21 | 1 | -1/+0 |
| | |||||
* | fix location of string file in Translations.md, fix some permissions and ↵ | friendica | 2014-01-21 | 3 | -18/+28 |
| | | | | owner vagueness (potential bugs) in profile_tabs() | ||||
* | seems you can't easily have a blank password for DAV guests, so the guest ↵ | friendica | 2014-01-21 | 2 | -2/+10 |
| | | | | password is now +++ | ||||
* | 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 | ||||
| | * | 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 | ||||
| | * | 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 |
|/ |