aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-274-10/+12
|\
| * add davguest param to cut/paste link for directories in mod/filestoragefriendica2014-01-262-4/+2
| * The final piece of the DAV authentication puzzle. Provide a directory view to...friendica2014-01-262-6/+10
* | Revert "disable feature setting for collections and make feature settings for...marijus2014-01-262-10/+7
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-265-5/+27
|\|
| * allow site defaults for enabled featuresfriendica2014-01-262-1/+3
| * don't prompt guests for a password if they're accessing an embedded public file.friendica2014-01-263-4/+24
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-01-263-111/+53
|\|
| * Merge https://github.com/friendica/red into zpullfriendica2014-01-251-2/+3
| |\
| | * Typoroot2014-01-251-2/+3
| * | some tweaks to items_fetch for the apifriendica2014-01-252-19/+21
| |/
| * Merge pull request #284 from cvogeley/masterfriendica2014-01-252-24/+47
| |\
| | * Check user_info['self] in api user_timelineChristian Vogeley2014-01-251-4/+13
| | * remove wall restrictionChristian Vogeley2014-01-251-2/+1
| | * API My wall postsChristian Vogeley2014-01-252-21/+33
| | * Add $since_id to items_fetchChristian Vogeley2014-01-221-2/+5
| * | set session['my_address'] to current site in change channel, not primary hub ...friendica2014-01-251-85/+1
* | | disable feature setting for collections and make feature settings for persona...marijus2014-01-252-7/+10
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-256-1307/+1332
|\ \
| * \ Merge pull request #285 from tobiasd/de20140125tobiasd2014-01-242-1302/+1309
| |\ \
| | * | DE: update to the stringsTobias Diekershoff2014-01-252-1302/+1309
| |/ /
| * | Merge pull request #283 from beardy-unixer/masterfriendica2014-01-244-5/+23
| |\ \
| | * | Left over line from placeholder.Thomas Willingham2014-01-251-1/+0
| | * | Add admin info to admin panel and site info.Thomas Willingham2014-01-244-5/+24
| |/ /
* / / get rid of bootstrap's blockqote margin css which is just bloody wrong and ca...friendica2014-01-253-2/+3
|/ /
* | prettyphoto (js|css) not foundfriendica2014-01-2449-259/+413
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-231-2/+3
|\ \
| * | Ooops, included site specific hackThomas Willingham2014-01-241-6/+0
| * | Make share previews a bit longer. We can't go any longer than thisThomas Willingham2014-01-241-2/+9
* | | add zid to audio/video (again)friendica2014-01-232-13/+50
|/ /
* | display a somewhat more pleasant hovertip on qr codesfriendica2014-01-231-1/+1
* | Merge https://github.com/friendica/red into zpullfriendica2014-01-2344-411/+0
|\ \
| * \ Merge pull request #281 from beardy-unixer/masterfriendica2014-01-2344-411/+0
| |\ \
| | * | Nobody seems to be using that anymoreThomas Willingham2014-01-2344-411/+0
* | | | fix marital partner linkingfriendica2014-01-232-26/+24
|/ / /
* | | Merge https://github.com/friendica/red into zpullfriendica2014-01-231-1/+1
|\ \ \
| * | | the bootstrap theme is obsolete, use clean insteadtobiasd2014-01-231-1/+1
* | | | mod_profperm migratedfriendica2014-01-234-519/+527
|/ / /
* | | missing filename in uploaded photos (we don't really use this, but we will ne...friendica2014-01-222-1/+2
* | | fix api/red/photos when supplied with an album namefriendica2014-01-221-1/+1
* | | API: provide a link to photo albums in api/red/albumsfriendica2014-01-221-1/+5
* | | Merge https://github.com/friendica/red into zpullfriendica2014-01-222-7/+10
|\| |
| * | Merge pull request #279 from git-marijus/masterfriendica2014-01-222-5/+5
| |\ \
| | * | update argument ?f=marijus2014-01-221-2/+2
| | * | make network tabs regard selected group (collection) and vice versamarijus2014-01-222-4/+4
| | |/
| * | Merge pull request #280 from beardy-unixer/masterfriendica2014-01-221-2/+5
| |\ \ | | |/ | |/|
| | * Give pages enough to construct a share button.Thomas Willingham2014-01-221-2/+5
| |/
* / try to reduce the number of simulaneous deliveries of the same post when deal...friendica2014-01-222-15/+42
|/
* simplify chanview authentication and make sure it carries through multiple ge...friendica2014-01-222-9/+5
* remove debuggingfriendica2014-01-211-1/+0