aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* begin the grand unification for 3.0. Start by splitting DAV into a web ↵friendica2015-01-062-27/+156
| | | | accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
* Merge branch 'master' into trinidadfriendica2015-01-063-152/+229
|\
| * 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 branch 'master' into trinidadfriendica2015-01-066-6/+412
|\| | |
| * | | 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
| | | |
* | | | Merge branch 'master' into trinidadfriendica2015-01-052-35/+48
|\| | |
| * | | 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.
* | | undo these bits of trinidad - we're going to do things differentlyfriendica2015-01-054-5/+4
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-051-0/+2
|\| |
| * | 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 branch 'master' into trinidadfriendica2015-01-05213-15617/+4152
|\| |
| * | 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
| | | * | Remove unneeded divgrow libraryStefan Parviainen2015-01-054-136/+0
| | | | |
| | | * | Unbreak readmoreStefan Parviainen2015-01-051-3/+5
| | | | |
| | | * | Make slider less uglyStefan Parviainen2015-01-051-0/+2
| | | | |
| | | * | Remove reference to non-existing colorbox.cssStefan Parviainen2015-01-051-1/+0
| | | | |
| | | * | Fix error with undefined profile_uidStefan Parviainen2015-01-051-0/+1
| | | | |
| | | * | Remove some unneeded librariesStefan Parviainen2015-01-0587-14625/+0
| | | | |
| | | * | Replace fancybox with colorboxStefan Parviainen2015-01-05101-716/+1522
| | | | |
| | | * | Update jGrowlStefan Parviainen2015-01-053-148/+4
| | | | |
| | | * | Replace jslider with jRangeStefan Parviainen2015-01-0517-6/+2148
| | | | |
| | | * | Replace divgrow with more modern readmore.jsStefan Parviainen2015-01-054-7/+495
| | |/ /
| * / / revupfriendica2015-01-051-1/+1
| |/ /
* | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\| |
| * | regression: autocomplete hovertip with url/address missing - useful for ↵friendica2015-01-041-1/+1
| | | | | | | | | | | | identifying connections based on their site if they have different channels (not clones) on different sites with all other identifying info the same.
* | | Merge branch 'master' into trinidadfriendica2015-01-042-2/+6
|\| |
| * | Merge pull request #819 from pafcu/aclpafcu2015-01-052-2/+6
| |\ \ | | | | | | | | Fix initEditor on non-wall pages
| | * | Fix initEditor on non-wall pagesStefan Parviainen2015-01-052-2/+6
| | | |
* | | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\| | |
| * | | the last checkin removed hostname from the address for autocomplete ↵friendica2015-01-041-1/+1
| | | | | | | | | | | | | | | | searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn.
* | | | Merge branch 'master' into trinidadfriendica2015-01-042-2/+2
|\| | |
| * | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-041-1/+1
| |\ \ \
| | * | | Merge pull request #817 from pafcu/aclpafcu2015-01-041-1/+1
| | |\| | | | | | | | | | | | Fix height calculation in acl.js
| | | * | Fix height calculation in acl.jsStefan Parviainen2015-01-041-1/+1
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 16:30:09 +0000