aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-1121-154/+169
|\ | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js
| * connection clone issuesfriendica2015-01-101-0/+3
| |
| * basic changes for file activitymarijus2015-01-092-1/+6
| |
| * clean up some url anomalies in dir_sort_links after security fixfriendica2015-01-081-1/+3
| |
| * double q argument could also cause issuesfriendica2015-01-081-1/+4
| |
| * SECURITY: dir_sort_links() exposes session cookiefriendica2015-01-081-2/+2
| |
| * include channel clones in PM deliveries (also some whitespace edits)friendica2015-01-083-16/+17
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-071-9/+1
| |\
| | * Merge autocomplete caching, show more results in navbar searchStefan Parviainen2015-01-074-42/+56
| | |\
| | * | Make nav search use textcompleteStefan Parviainen2015-01-071-9/+1
| | | |
| * | | syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-071-0/+2
| | |/ | |/|
| * | don't update locally deleted itemsfriendica2015-01-061-3/+8
| | |
| * | don't let dns_get_record() "write to screen" if it errors.friendica2015-01-061-2/+2
| | |
| * | lines reversed in handle_tag()friendica2015-01-061-2/+2
| | |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-061-1/+1
| |\|
| | * Add title to bb_observer tags to further clarify a bit what's going onStefan Parviainen2015-01-061-1/+1
| | |
| * | regression: need float clear on manage page so footer doesn't end up floated,friendica2015-01-051-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 ↵friendica2015-01-051-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 jRangeStefan Parviainen2015-01-051-1/+1
| |
| * Use grouped select field for role selectionStefan Parviainen2015-01-011-29/+9
| |
| * Use grouped select field for timezone selectionStefan Parviainen2015-01-011-38/+9
| |
| * Revert "Revert "Language names via intl library.""Stefan Parviainen2014-12-312-7/+25
| | | | | | | | This reverts commit 4f35efa0bad4ae6489b63f3eebafe6542d654094.
| * Revert "Language names via intl library."RedMatrix2014-12-312-25/+7
| |
| * Merge pull request #796 from pafcu/profeditfixRedMatrix2014-12-311-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 disabledStefan Parviainen2014-12-301-1/+4
| | |
| * | Merge pull request #794 from pafcu/langRedMatrix2014-12-312-7/+25
| |\ \ | | | | | | | | Language names via intl library.
| | * | Update function doc, return language code if language is not recognizedStefan Parviainen2014-12-301-3/+7
| | | |
| | * | Language names via intl library. Fixes #773Stefan Parviainen2014-12-302-5/+19
| | |/
| * | Merge pull request #791 from pafcu/notificationsRedMatrix2014-12-311-2/+15
| |\ \ | | | | | | | | Improved notifications
| | * | Make showing wall posts, intros and private messages under Notices optionalStefan Parviainen2014-12-301-2/+15
| | | |
| * | | design fixes for photos, files and random fixesmarijus2014-12-301-0/+6
| | |/ | |/|
| * | fix recursive file permissionsmarijus2014-12-301-1/+1
| |/
| * Merge pull request #778 from pafcu/loginredirRedMatrix2014-12-291-1/+1
| |\ | | | | | | Redirect to login page on failed login. Fixes #628
| | * Redirect to login page on failed login. Fixes #628Stefan Parviainen2014-12-281-1/+1
| | |
| * | Merge pull request #779 from pafcu/audiopafcu2014-12-281-2/+2
| |\ \ | | | | | | | | Make spaces work in [audio] and [video]. Fixes #774
| | * | Fix typoStefan Parviainen2014-12-281-1/+1
| | | |
| | * | Make spaces work in [audio] and [video]. Fixes #774Stefan Parviainen2014-12-281-2/+2
| | |/
* | / Fix for issue #763 Error creating new channel within the limits of theChristian Vogeley2015-01-112-1/+27
|/ / | | | | | | subscription plan
* / some more mime-type -> icon for filebrowsermarijus2014-12-271-2/+13
|/
* more work on filesmarijus2014-12-271-0/+41
|
* change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that ↵friendica2014-12-261-53/+53
| | | | individual connections can be revoked instead of this being inherited and un-changeable
* cleanup bb2diaspora - was getting cruftyfriendica2014-12-231-20/+0
|
* diaspora formatting improvements (getting too many xx-large posts)friendica2014-12-221-4/+6
|
* some improvements in api direct messagesfriendica2014-12-221-4/+9
|
* direct messages in api have some issues, not properly ported from friendica ↵friendica2014-12-222-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 itStefan Parviainen2014-12-221-6/+23
|
* Fix feature check in apps (missing parenthesis), allow multiple requires ↵Stefan Parviainen2014-12-221-54/+59
| | | | (comma separated)
* provide last successful poll run time (using relative time) in siteinfo so ↵friendica2014-12-212-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_mergefriendica2014-12-211-10/+14
|\
| * files: make mod/filestorage.php load via ajax and some design work. work in ↵marijus2014-12-211-10/+14
| | | | | | | | progress...