| Commit message (Expand) | Author | Age | Files | Lines |
* | do not destroy page layout if feature_encrypt is not enabled | Mario Vavti | 2015-03-19 | 1 | -2/+2 |
* | make the channel item query match recent changes to network item query (and s... | friendica | 2015-03-18 | 3 | -5/+7 |
* | Change wording on the photo location feature. When photos are merged with DAV... | friendica | 2015-03-18 | 1 | -1/+1 |
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-18 | 7 | -2807/+2925 |
|\ |
|
| * | remove px from default value | Mario Vavti | 2015-03-18 | 1 | -1/+1 |
| * | just to be sure | Mario Vavti | 2015-03-18 | 2 | -2/+2 |
| * | move body-font-size setting backt to expert. most people probably use browser... | Mario Vavti | 2015-03-18 | 1 | -4/+1 |
| * | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-18 | 2 | -2785/+2906 |
| |\ |
|
| | * | Update Dutch translations | jeroenpraat | 2015-03-18 | 2 | -2785/+2906 |
| * | | make every page regard max content width setting and move the setting out of ... | Mario Vavti | 2015-03-18 | 5 | -18/+18 |
| |/ |
|
* / | we upped the php version requirement. So up yours. | friendica | 2015-03-18 | 2 | -2/+2 |
|/ |
|
* | fix the map embed issue by keeping the map visible but moving it far off the ... | friendica | 2015-03-17 | 2 | -3/+8 |
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-17 | 15 | -436/+840 |
|\ |
|
| * | move bootbox out of bootstrap | Mario Vavti | 2015-03-17 | 3 | -1/+1 |
| * | update bootstrap-3.3.4 and bootbox-4.4.0 | Mario Vavti | 2015-03-17 | 14 | -431/+835 |
* | | ok it has to be owner. | friendica | 2015-03-17 | 1 | -3/+3 |
|/ |
|
* | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-17 | 3 | -2820/+2941 |
|\ |
|
| * | Merge pull request #932 from tuscanhobbit/dev | Paolo T | 2015-03-17 | 2 | -2818/+2939 |
| |\ |
|
| | * | Updated Italian strings | Paolo Tacconi | 2015-03-17 | 2 | -2818/+2939 |
| * | | get the correct hemisphere for geotagged photos | friendica | 2015-03-17 | 1 | -2/+2 |
* | | | update templates | Mario Vavti | 2015-03-17 | 4 | -6/+18 |
|/ / |
|
* | | turn photo location mapping into a feature | friendica | 2015-03-17 | 2 | -1/+2 |
* | | The random bad signatures are because something somewhere is trimming the bod... | friendica | 2015-03-17 | 3 | -4/+4 |
* | | display a map for photos if allowed. Note: there is a bug in that if the map ... | friendica | 2015-03-16 | 4 | -1/+59 |
* | | started to add the ability to geotag photos (default will be disabled) but my... | friendica | 2015-03-16 | 2 | -3/+12 |
* | | regression: visual feedback that page/content is loading when affinity slider... | friendica | 2015-03-16 | 1 | -0/+2 |
* | | openid cleanup | friendica | 2015-03-16 | 3 | -105/+73 |
* | | make sure this sucker is quiet | friendica | 2015-03-16 | 1 | -1/+1 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-16 | 1 | -0/+2 |
|\ \ |
|
| * | | show generic submit button only if plugin name is provided | Mario Vavti | 2015-03-16 | 1 | -0/+2 |
* | | | also update the api to match | friendica | 2015-03-16 | 1 | -2/+2 |
* | | | phase one of the great file storage unification - use one button for uploads ... | friendica | 2015-03-16 | 4 | -17/+34 |
|/ / |
|
* | | start on some db_table doco | friendica | 2015-03-15 | 2 | -14/+44 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-15 | 14 | -1338/+1259 |
|\ \ |
|
| * \ | Merge pull request #931 from dawnbreak/master | RedMatrix | 2015-03-16 | 14 | -1338/+1259 |
| |\ \ |
|
| | * | | Documentation and remove duplicate code. | Klaus Weidenbach | 2015-03-16 | 1 | -72/+79 |
| | * | | Some JavaScript cleanups. | Klaus Weidenbach | 2015-03-15 | 13 | -1266/+1180 |
| |/ / |
|
* | | | mod_id: load profile so the sidebar profile will work | friendica | 2015-03-15 | 2 | -39/+20 |
* | | | Show profile on openid server page | friendica | 2015-03-15 | 1 | -0/+4 |
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-15 | 2 | -7/+12 |
|\| | |
|
| * | | assure that badges will be displayed as circles no matter what font is used a... | Mario Vavti | 2015-03-14 | 2 | -7/+12 |
* | | | mysql schema typo, do the install check for store before chcking smarty, as t... | friendica | 2015-03-15 | 4 | -6/+6 |
|/ / |
|
* | | revert the revert - that is working. My test was bad. | friendica | 2015-03-14 | 1 | -3/+3 |
* | | revert and rethink | friendica | 2015-03-14 | 2 | -4/+4 |
* | | create terms for Diaspora mention tags - which in Diaspora are handled differ... | friendica | 2015-03-13 | 2 | -9/+103 |
* | | Merge pull request #929 from zzottel/master | RedMatrix | 2015-03-14 | 1 | -3/+3 |
|\ \ |
|
| * | | fix posts not showing up in network if author is not in connections | zottel | 2015-03-14 | 1 | -3/+3 |
* | | | Merge pull request #928 from dawnbreak/docu | RedMatrix | 2015-03-14 | 2 | -29/+69 |
|\ \ \
| |/ /
|/| | |
|
| * | | Some documentation, fix chatroom service class lookup. | Klaus Weidenbach | 2015-03-14 | 2 | -29/+69 |
* | | | use local_channel() connnections to match the abook against when joining the ... | friendica | 2015-03-13 | 1 | -2/+2 |