aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* include channel clones in PM deliveries (also some whitespace edits)friendica2015-01-084-17/+18
|
* the yearly license updatefriendica2015-01-071-1/+1
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-0715-143/+116
|\
| * Merge pull request #829 from pafcu/oneautocompleterRedMatrix2015-01-0815-142/+115
| |\ | | | | | | Steps towards a single autocompleter
| | * Merge autocomplete caching, show more results in navbar searchStefan Parviainen2015-01-0712-191/+708
| | |\ | | |/ | |/|
| * | also style the collapse linkmarijus2015-01-071-1/+1
| | |
| | * Typo + commentStefan Parviainen2015-01-071-1/+1
| | |
| | * Remove out-of-date mod_message.jsStefan Parviainen2015-01-071-13/+0
| | |
| | * Add autosubmit feature to textcomplete based autocompleterStefan Parviainen2015-01-076-7/+18
| | |
| | * Make mod_sources autocomplete use textcompleteStefan Parviainen2015-01-071-13/+5
| | |
| | * Make photos tag autocomplete use textcompleteStefan Parviainen2015-01-071-13/+5
| | |
| | * Make mod_connections search use textcompleteStefan Parviainen2015-01-071-9/+1
| | |
| | * Return results from acl.php in standard formStefan Parviainen2015-01-071-20/+0
| | |
| | * Allow passing autocomplete type to contact_autocompleteStefan Parviainen2015-01-073-4/+6
| | |
| | * Disable browser-based autocomplete when using the textcomplete based oneStefan Parviainen2015-01-071-0/+3
| | |
| | * Make searchbox use textcompleteStefan Parviainen2015-01-071-6/+1
| | |
| | * Make mail use textcompleteStefan Parviainen2015-01-071-9/+2
| | |
| | * Make mod_poke use textcompleteStefan Parviainen2015-01-072-14/+25
| | |
| | * Make nav search use textcompleteStefan Parviainen2015-01-073-27/+41
| | |
| | * Rename some stuff related to autocompleteStefan Parviainen2015-01-075-14/+14
| | |
| | * Allow textcomplete to work on inputs (PR also filed upstream)Stefan Parviainen2015-01-071-3/+4
| | |
* | | syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-075-8/+10
| | |
* | | don't allow admin to delete the sys channel from the channel manage pagefriendica2015-01-062-3/+3
|/ /
* | don't update locally deleted itemsfriendica2015-01-061-3/+8
| |
* | this brings us up to datefriendica2015-01-061-1/+1
| |
* | don't let dns_get_record() "write to screen" if it errors.friendica2015-01-061-2/+2
| |
* | Merge pull request #826 from pafcu/cache_autocompleteRedMatrix2015-01-071-0/+17
|\ \ | | | | | | Cache autocomplete results locally (the one in the editor)
| * | Cache autocomplete results locally (the one in the editor)Stefan Parviainen2015-01-061-0/+17
| |/
* | lines reversed in handle_tag()friendica2015-01-061-2/+2
| |
* | Merge pull request #825 from einervonvielen/dev_beginning_fixRedMatrix2015-01-071-7/+8
|\ \ | | | | | | Corrected errors in chapter 'Contribute your changes via github'
| * | Corrected errors in chapter 'Contribute your changes via github'Einer von Vielen2015-01-061-7/+8
| | | | | | | | | | | | - changed commit statement - changed push statement (it pointed to the orign)
* | | Merge branch 'pafcu-mainjsoptimize'friendica2015-01-062-145/+221
|\ \ \
| * | | Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into ↵friendica2015-01-062-145/+221
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | pafcu-mainjsoptimize Conflicts: view/js/main.js
| * | | Don't update fuzzy time for items in a collapsed thread to increase performance.Stefan Parviainen2015-01-061-6/+13
| | | |
| * | | Update jquery.timeago.js to add support for dispose actionStefan Parviainen2015-01-061-139/+208
| | | |
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-065-5/+411
|\ \ \ \
| * | | | add some style to divgrowmoremarijus2015-01-061-1/+1
| | |/ / | |/| |
| * | | Merge pull request #823 from einervonvielen/dev_beginningmrjive2015-01-062-0/+405
| |\ \ \ | | | | | | | | | | Step-by-step manual to debug the red matrix (php) and to contribute code
| | * | | spellingEiner von Vielen2015-01-061-2/+2
| | | | |
| | * | | added modification of branchEiner von Vielen2015-01-061-53/+64
| | | | |
| | * | | Mainly it shows how to debug the red matrix (php) in a virtual machine and ↵Einer von Vielen2015-01-061-0/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contribute changes via git. It will guide to the following steps: - Install a Virtual Machine - Install Apache Web Server - Install PHP, MySQL, phpMyAdmin - Fork the project on github to be able contribute - Install the RED Matrix - Debug the server via eclipse - Contribute your changes via github
| | * | | Mainly it shows how to debug the red matrix (php) in a virtual machine and ↵Einer von Vielen2015-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contribute changes via git. It will guide to the following steps: - Install a Virtual Machine - Install Apache Web Server - Install PHP, MySQL, phpMyAdmin - Fork the project on github to be able contribute - Install the RED Matrix - Debug the server via eclipse - Contribute your changes via github
| * | | | Merge pull request #822 from pafcu/masterpafcu2015-01-062-4/+5
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| Add title to bb_observer tags to further clarify a bit what's going on
| | * | Fix bug in readmore.jsStefan Parviainen2015-01-061-3/+4
| | | |
| | * | Add title to bb_observer tags to further clarify a bit what's going onStefan Parviainen2015-01-061-1/+1
| |/ /
* | | revupfriendica2015-01-061-1/+1
| | |
* | | regression: need float clear on manage page so footer doesn't end up floated,friendica2015-01-052-35/+48
|/ / | | | | | | 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
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-05212-15616/+4151
|\ \
| * \ Merge pull request #820 from pafcu/nomigrateRedMatrix2015-01-06212-15616/+4151
| |\ \ | | | | | | | | Steps towards not needing jquery-migrate