Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add expire setting, take out unknown mailers and max friend requests per day ↵ | friendica | 2014-03-19 | 2 | -2/+3 |
| | | | | which aren't implemented | ||||
* | doco | friendica | 2014-03-19 | 1 | -0/+1 |
| | |||||
* | prune_hub_reinstalls() and add cron weekly as a side effect | friendica | 2014-03-19 | 3 | -1/+50 |
| | |||||
* | lesson learned.... dont fix anything on a mobile device | git-marijus | 2014-03-19 | 1 | -2/+1 |
| | |||||
* | this shouldnt be there | git-marijus | 2014-03-19 | 1 | -3/+1 |
| | |||||
* | bootstrapify common tabs and make show aside/tabs buttons only appear if ↵ | marijus | 2014-03-19 | 7 | -40/+41 |
| | | | | there is something to show | ||||
* | cleanup | friendica | 2014-03-18 | 4 | -27/+37 |
| | |||||
* | oops | Thomas Willingham | 2014-03-18 | 1 | -1/+1 |
| | |||||
* | Missed one | Thomas Willingham | 2014-03-18 | 1 | -2/+3 |
| | |||||
* | sprintf error | friendica | 2014-03-17 | 2 | -2/+2 |
| | |||||
* | remove mysql dependencies from cache api | friendica | 2014-03-16 | 1 | -31/+16 |
| | |||||
* | mail notification goes to old link | friendica | 2014-03-16 | 1 | -1/+1 |
| | |||||
* | little fixes of hopefully nil significance | friendica | 2014-03-16 | 6 | -18/+19 |
| | |||||
* | this is the correct fix | friendica | 2014-03-16 | 1 | -2/+2 |
| | |||||
* | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-16 | 1 | -1/+2 |
|\ | |||||
| * | Merge pull request #367 from cvogeley/master | friendica | 2014-03-16 | 1 | -1/+2 |
| |\ | | | | | | | API: statusnet_html:trim was trimming too much | ||||
| | * | merge | Christian Vogeley | 2014-03-15 | 34 | -9425/+7932 |
| | |\ | | |/ | |/| | |||||
| | * | API: statusnet_html:trim was trimming too much | Christian Vogeley | 2014-03-15 | 1 | -1/+2 |
| | | | |||||
* | | | doc update | friendica | 2014-03-16 | 75 | -866/+1665 |
|/ / | |||||
* | | contact_block() not being shown to unauthenticated visitors - even if perms ↵ | friendica | 2014-03-13 | 2 | -4/+7 |
| | | | | | | | | allow. Also separate the permissions logic for this function so that we can have a mini-profile widget and a separate contact_block widget instead of always lumping them together. We probably also should move contact_block() outside of include/text.php as it doesn't really belong there. Just not sure where it belongs - perhaps contact_widgets wouold be a good place. | ||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-13 | 6 | -9/+25 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-03-13 | 5 | -6/+18 |
| |\ \ | |||||
| * | | | move region_1 to off instead of removing it and dont squelch region_2 when ↵ | marijus | 2014-03-13 | 6 | -9/+25 |
| | | | | | | | | | | | | | | | | region_1 moves in again | ||||
* | | | | remove allowed friend domains and allowed email domains from admin settings ↵ | friendica | 2014-03-13 | 2 | -3/+1 |
| |/ / |/| | | | | | | | | - as they are not implemented | ||||
* | | | json_return_and_dir isn't a thing | Thomas Willingham | 2014-03-13 | 1 | -1/+1 |
| | | | |||||
* | | | json_return_and_dir is a typo | friendica | 2014-03-12 | 1 | -1/+1 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-12 | 2 | -3/+10 |
|\ \ \ | |||||
| * \ \ | Merge pull request #366 from beardy-unixer/master | friendica | 2014-03-13 | 2 | -3/+10 |
| |\ \ \ | | |/ / | |/| | | Stick help in a template | ||||
| | * | | Stick help in a template | Thomas Willingham | 2014-03-12 | 2 | -3/+10 |
| |/ / | |||||
* / / | fix colors on input elements which bootstrap set to "inherit" and doesn't ↵ | friendica | 2014-03-12 | 2 | -1/+6 |
|/ / | | | | | | | play nicely with dark themes. | ||||
* | | file had wrong extension | friendica | 2014-03-11 | 3 | -16/+7 |
| | | |||||
* | | update acl internal list whenever there is a change - the submit handler ↵ | friendica | 2014-03-11 | 1 | -10/+20 |
| | | | | | | | | seems to be unreliable or is getting into a race condition. | ||||
* | | protect filed conversations from expiration - we check the parent to see if ↵ | friendica | 2014-03-11 | 2 | -1/+15 |
| | | | | | | | | it is filed, but one may have filed a comment and that will vanish when the parent expires unless the parent is protected. | ||||
* | | get rid of fancybox for photos upload, not just photo edit | friendica | 2014-03-11 | 2 | -1/+6 |
| | | |||||
* | | norwegian strings update | friendica | 2014-03-11 | 2 | -3/+3 |
| | | |||||
* | | revert recent changes to cmtBbClose which removed the ability to insert ↵ | friendica | 2014-03-11 | 1 | -4/+4 |
| | | | | | | | | quotes into an empty comment box | ||||
* | | version update | friendica | 2014-03-11 | 2 | -2/+2 |
| | | |||||
* | | failed experiment - revert the directory to 80 results per page until ↵ | friendica | 2014-03-10 | 1 | -1/+1 |
| | | | | | | | | somebody implements endless scroll on the thing. 300 takes far too long to load all the images. | ||||
* | | nb-no language update | friendica | 2014-03-10 | 2 | -8867/+7302 |
| | | |||||
* | | Merge pull request #363 from git-marijus/master | friendica | 2014-03-11 | 9 | -51/+50 |
|\ \ | | | | | | | this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space. | ||||
| * | | 10px is probably to close | marijus | 2014-03-10 | 1 | -2/+2 |
| | | | |||||
| * | | fix lock position | marijus | 2014-03-10 | 2 | -7/+4 |
| | | | |||||
| * | | fixes locations with a link | marijus | 2014-03-10 | 1 | -1/+1 |
| | | | |||||
| * | | this commit is an attempt to make conv items better scalable on smaller ↵ | marijus | 2014-03-10 | 9 | -43/+45 |
|/ / | | | | | | | screens. also save some horizontal space. | ||||
* | | The README is getting a bit tired and really needs a re-write, but in the ↵ | friendica | 2014-03-10 | 2 | -3/+1 |
| | | | | | | | | meanitme there's a link to donations that had to be cleaned up until we figure out how to do that without paypal. | ||||
* | | update cacert.pem , don't hide url link for rmagic | friendica | 2014-03-09 | 4 | -463/+352 |
| | | |||||
* | | describe the known flaws | friendica | 2014-03-08 | 1 | -1/+3 |
| | | |||||
* | | advanced directory search help file | friendica | 2014-03-08 | 2 | -0/+56 |
| | | |||||
* | | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-08 | 1 | -3/+2 |
|\ \ | |||||
| * | | Merge pull request #361 from cvogeley/master | friendica | 2014-03-09 | 1 | -3/+2 |
| |\| | | | | | | | allow again zrl and zmg in api |