Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-27 | 2 | -4/+27 | |
|\ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/MicMee/red | Michael Meer | 2014-01-27 | 66 | -1685/+1831 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-24 | 52 | -972/+605 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/red | Michael Meer | 2014-01-22 | 2 | -9/+5 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | 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 | |
* | | | | | | | | | | | | cleanup include/menu in preparation for the next phase of bookmarking | friendica | 2014-01-27 | 3 | -42/+11 | |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | add davguest param to cut/paste link for directories in mod/filestorage | friendica | 2014-01-26 | 2 | -4/+2 | |
* | | | | | | | | | | | The final piece of the DAV authentication puzzle. Provide a directory view to... | friendica | 2014-01-26 | 2 | -6/+10 | |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
* | | | | | | | | | | allow site defaults for enabled features | friendica | 2014-01-26 | 2 | -1/+3 | |
* | | | | | | | | | | don't prompt guests for a password if they're accessing an embedded public file. | friendica | 2014-01-26 | 3 | -4/+24 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-01-25 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Typo | root | 2014-01-25 | 1 | -2/+3 | |
* | | | | | | | | | | some tweaks to items_fetch for the api | friendica | 2014-01-25 | 2 | -19/+21 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #284 from cvogeley/master | friendica | 2014-01-25 | 2 | -24/+47 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Check user_info['self] in api user_timeline | Christian Vogeley | 2014-01-25 | 1 | -4/+13 | |
| * | | | | | | | | | remove wall restriction | Christian Vogeley | 2014-01-25 | 1 | -2/+1 | |
| * | | | | | | | | | API My wall posts | Christian Vogeley | 2014-01-25 | 2 | -21/+33 | |
| * | | | | | | | | | Add $since_id to items_fetch | Christian Vogeley | 2014-01-22 | 1 | -2/+5 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | set session['my_address'] to current site in change channel, not primary hub ... | friendica | 2014-01-25 | 1 | -85/+1 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | 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 |