Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 21 | -154/+169 |
|\ | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js | ||||
| * | connection clone issues | friendica | 2015-01-10 | 1 | -0/+3 |
| | | |||||
| * | basic changes for file activity | marijus | 2015-01-09 | 2 | -1/+6 |
| | | |||||
| * | clean up some url anomalies in dir_sort_links after security fix | friendica | 2015-01-08 | 1 | -1/+3 |
| | | |||||
| * | double q argument could also cause issues | friendica | 2015-01-08 | 1 | -1/+4 |
| | | |||||
| * | SECURITY: dir_sort_links() exposes session cookie | friendica | 2015-01-08 | 1 | -2/+2 |
| | | |||||
| * | include channel clones in PM deliveries (also some whitespace edits) | friendica | 2015-01-08 | 3 | -16/+17 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-07 | 1 | -9/+1 |
| |\ | |||||
| | * | Merge autocomplete caching, show more results in navbar search | Stefan Parviainen | 2015-01-07 | 4 | -42/+56 |
| | |\ | |||||
| | * | | Make nav search use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -9/+1 |
| | | | | |||||
| * | | | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 1 | -0/+2 |
| | |/ | |/| | |||||
| * | | don't update locally deleted items | friendica | 2015-01-06 | 1 | -3/+8 |
| | | | |||||
| * | | don't let dns_get_record() "write to screen" if it errors. | friendica | 2015-01-06 | 1 | -2/+2 |
| | | | |||||
| * | | lines reversed in handle_tag() | friendica | 2015-01-06 | 1 | -2/+2 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-06 | 1 | -1/+1 |
| |\| | |||||
| | * | Add title to bb_observer tags to further clarify a bit what's going on | Stefan Parviainen | 2015-01-06 | 1 | -1/+1 |
| | | | |||||
| * | | regression: need float clear on manage page so footer doesn't end up floated, | friendica | 2015-01-05 | 1 | -35/+44 |
| |/ | | | | | | | add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this. | ||||
| * | detect https coming through reverse proxy or load balancer using ↵ | friendica | 2015-01-05 | 1 | -0/+2 |
| | | | | | | | | x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled | ||||
| * | Replace jslider with jRange | Stefan Parviainen | 2015-01-05 | 1 | -1/+1 |
| | | |||||
| * | Use grouped select field for role selection | Stefan Parviainen | 2015-01-01 | 1 | -29/+9 |
| | | |||||
| * | Use grouped select field for timezone selection | Stefan Parviainen | 2015-01-01 | 1 | -38/+9 |
| | | |||||
| * | Revert "Revert "Language names via intl library."" | Stefan Parviainen | 2014-12-31 | 2 | -7/+25 |
| | | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094. | ||||
| * | Revert "Language names via intl library." | RedMatrix | 2014-12-31 | 2 | -25/+7 |
| | | |||||
| * | Merge pull request #796 from pafcu/profeditfix | RedMatrix | 2014-12-31 | 1 | -1/+4 |
| |\ | | | | | | | Don't show links to edit alternate profiles if multi_profiles is disable... | ||||
| | * | Don't show links to edit alternate profiles if multi_profiles is disabled | Stefan Parviainen | 2014-12-30 | 1 | -1/+4 |
| | | | |||||
| * | | Merge pull request #794 from pafcu/lang | RedMatrix | 2014-12-31 | 2 | -7/+25 |
| |\ \ | | | | | | | | | Language names via intl library. | ||||
| | * | | Update function doc, return language code if language is not recognized | Stefan Parviainen | 2014-12-30 | 1 | -3/+7 |
| | | | | |||||
| | * | | Language names via intl library. Fixes #773 | Stefan Parviainen | 2014-12-30 | 2 | -5/+19 |
| | |/ | |||||
| * | | Merge pull request #791 from pafcu/notifications | RedMatrix | 2014-12-31 | 1 | -2/+15 |
| |\ \ | | | | | | | | | Improved notifications | ||||
| | * | | Make showing wall posts, intros and private messages under Notices optional | Stefan Parviainen | 2014-12-30 | 1 | -2/+15 |
| | | | | |||||
| * | | | design fixes for photos, files and random fixes | marijus | 2014-12-30 | 1 | -0/+6 |
| | |/ | |/| | |||||
| * | | fix recursive file permissions | marijus | 2014-12-30 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #778 from pafcu/loginredir | RedMatrix | 2014-12-29 | 1 | -1/+1 |
| |\ | | | | | | | Redirect to login page on failed login. Fixes #628 | ||||
| | * | Redirect to login page on failed login. Fixes #628 | Stefan Parviainen | 2014-12-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #779 from pafcu/audio | pafcu | 2014-12-28 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Make spaces work in [audio] and [video]. Fixes #774 | ||||
| | * | | Fix typo | Stefan Parviainen | 2014-12-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | Make spaces work in [audio] and [video]. Fixes #774 | Stefan Parviainen | 2014-12-28 | 1 | -2/+2 |
| | |/ | |||||
* | / | Fix for issue #763 Error creating new channel within the limits of the | Christian Vogeley | 2015-01-11 | 2 | -1/+27 |
|/ / | | | | | | | subscription plan | ||||
* / | some more mime-type -> icon for filebrowser | marijus | 2014-12-27 | 1 | -2/+13 |
|/ | |||||
* | more work on files | marijus | 2014-12-27 | 1 | -0/+41 |
| | |||||
* | change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that ↵ | friendica | 2014-12-26 | 1 | -53/+53 |
| | | | | individual connections can be revoked instead of this being inherited and un-changeable | ||||
* | cleanup bb2diaspora - was getting crufty | friendica | 2014-12-23 | 1 | -20/+0 |
| | |||||
* | diaspora formatting improvements (getting too many xx-large posts) | friendica | 2014-12-22 | 1 | -4/+6 |
| | |||||
* | some improvements in api direct messages | friendica | 2014-12-22 | 1 | -4/+9 |
| | |||||
* | direct messages in api have some issues, not properly ported from friendica ↵ | friendica | 2014-12-22 | 2 | -10/+12 |
| | | | | | | originally. Here's a start. I think at best they may return encrypted gibberish currently, but let's work through them one at a time. | ||||
* | Option to check that a random profile works before returning it | Stefan Parviainen | 2014-12-22 | 1 | -6/+23 |
| | |||||
* | Fix feature check in apps (missing parenthesis), allow multiple requires ↵ | Stefan Parviainen | 2014-12-22 | 1 | -54/+59 |
| | | | | (comma separated) | ||||
* | provide last successful poll run time (using relative time) in siteinfo so ↵ | friendica | 2014-12-21 | 2 | -5/+2 |
| | | | | that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-21 | 1 | -10/+14 |
|\ | |||||
| * | files: make mod/filestorage.php load via ajax and some design work. work in ↵ | marijus | 2014-12-21 | 1 | -10/+14 |
| | | | | | | | | progress... |