aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #376 from cvogeley/masterfriendica2014-03-243-17/+37
|\|
| * Add color picker to theme settingsChristian Vogeley2014-03-233-17/+37
* | Merge https://github.com/friendica/red into zpullfriendica2014-03-238-90/+39
|\|
| * Merge pull request #375 from cvogeley/masterfriendica2014-03-231-3/+5
| |\
| | * Narrow navbar:Switch to bs default on small screensChristian Vogeley2014-03-221-3/+5
| * | Merge pull request #374 from git-marijus/masterfriendica2014-03-231-1/+3
| |\ \
| | * | add width and height to uploaded photo bodymarijus2014-03-221-1/+3
| |/ /
| * | use border-box for everythingmarijus2014-03-226-38/+28
| * | re-enable nav opacity and minor style.css cleanupmarijus2014-03-212-48/+3
* | | improve curl error loggingfriendica2014-03-232-2/+4
|/ /
* | we don't allow forgeries to be received - save some bandwidth by not allowing...friendica2014-03-211-0/+5
* | doc updatefriendica2014-03-2125-617/+785
* | found what I believe is the root cause of issue #230, but don't yet have a wo...friendica2014-03-201-13/+21
* | increase log info to track down source of ownership failuresfriendica2014-03-202-2/+2
* | add expire setting, take out unknown mailers and max friend requests per day ...friendica2014-03-192-2/+3
* | docofriendica2014-03-191-0/+1
* | prune_hub_reinstalls() and add cron weekly as a side effectfriendica2014-03-193-1/+50
* | lesson learned.... dont fix anything on a mobile devicegit-marijus2014-03-191-2/+1
* | this shouldnt be theregit-marijus2014-03-191-3/+1
* | bootstrapify common tabs and make show aside/tabs buttons only appear if ther...marijus2014-03-197-40/+41
* | cleanupfriendica2014-03-184-27/+37
* | oopsThomas Willingham2014-03-181-1/+1
* | Missed oneThomas Willingham2014-03-181-2/+3
* | sprintf errorfriendica2014-03-172-2/+2
* | remove mysql dependencies from cache apifriendica2014-03-161-31/+16
* | mail notification goes to old linkfriendica2014-03-161-1/+1
* | little fixes of hopefully nil significancefriendica2014-03-166-18/+19
* | this is the correct fixfriendica2014-03-161-2/+2
* | Merge https://github.com/friendica/red into zpullfriendica2014-03-161-1/+2
|\ \
| * | Merge pull request #367 from cvogeley/masterfriendica2014-03-161-1/+2
| |\|
| | * mergeChristian Vogeley2014-03-1534-9425/+7932
| | |\ | | |/ | |/|
| | * API: statusnet_html:trim was trimming too muchChristian Vogeley2014-03-151-1/+2
* | | doc updatefriendica2014-03-1675-866/+1665
|/ /
* | contact_block() not being shown to unauthenticated visitors - even if perms a...friendica2014-03-132-4/+7
* | Merge https://github.com/friendica/red into zpullfriendica2014-03-136-9/+25
|\ \
| * \ Merge branch 'master' of https://github.com/friendica/redmarijus2014-03-135-6/+18
| |\ \
| * | | move region_1 to off instead of removing it and dont squelch region_2 when re...marijus2014-03-136-9/+25
* | | | remove allowed friend domains and allowed email domains from admin settings -...friendica2014-03-132-3/+1
| |/ / |/| |
* | | json_return_and_dir isn't a thingThomas Willingham2014-03-131-1/+1
* | | json_return_and_dir is a typofriendica2014-03-121-1/+1
* | | Merge https://github.com/friendica/red into zpullfriendica2014-03-122-3/+10
|\ \ \
| * \ \ Merge pull request #366 from beardy-unixer/masterfriendica2014-03-132-3/+10
| |\ \ \ | | |/ / | |/| |
| | * | Stick help in a templateThomas Willingham2014-03-122-3/+10
| |/ /
* / / fix colors on input elements which bootstrap set to "inherit" and doesn't pla...friendica2014-03-122-1/+6
|/ /
* | file had wrong extensionfriendica2014-03-113-16/+7
* | update acl internal list whenever there is a change - the submit handler seem...friendica2014-03-111-10/+20
* | protect filed conversations from expiration - we check the parent to see if i...friendica2014-03-112-1/+15
* | get rid of fancybox for photos upload, not just photo editfriendica2014-03-112-1/+6
* | norwegian strings updatefriendica2014-03-112-3/+3
* | revert recent changes to cmtBbClose which removed the ability to insert quote...friendica2014-03-111-4/+4