aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ /
* | 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
| | * | 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
|/ /
* | 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 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
| | |
* | | 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 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
| | | |
* | | | only check the LHS of xchan_addr for autocomplete, don't match on the hostname.friendica2015-01-041-1/+1
|/ / /
* | | Merge pull request #816 from pafcu/aclRedMatrix2015-01-055-80/+88
|\| | | | | | | | Autocomplete improvements
| * | TypoStefan Parviainen2015-01-041-3/+3
| | |
| * | Sorting of autocompleteStefan Parviainen2015-01-0483-7141/+7366
| |\ \
| * | | Autocmplete suggestions for non-local users, also suggest from visited ↵Stefan Parviainen2015-01-045-80/+68
| | | | | | | | | | | | | | | | channel's connections
* | | | Fix wrong requireStefan Parviainen2015-01-041-1/+1
| |/ / |/| |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-0410-4623/+4677
|\ \ \
| * | | update NL and text-background-fix in chat for alternatives schemasJeroen2015-01-038-4620/+4672
| | | |
| * | | provide some info for buttonsmarijus2015-01-032-3/+5
| | | |
* | | | remove hard-coded url to caterva.eu from events code.friendica2015-01-042-2/+2
|/ / /
* | | no newline at end of filefriendica2015-01-021-1/+1
| | |
* | | some work on the edit connection workflow explanation and connedit page. ↵friendica2015-01-024-26/+46
| | | | | | | | | | | | This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
* | | doc updatesfriendica2015-01-0263-2458/+2562
| | |
* | | Merge pull request #813 from pafcu/checkboxesRedMatrix2015-01-037-83/+63
|\| | | | | | | | Reworked switch to also display text
| * | Reworked switch to also display textStefan Parviainen2015-01-027-83/+63
| | |
* | | Merge pull request #812 from f03el/masterRedMatrix2015-01-031-21/+21
|\ \ \ | | | | | | | | Use HTML entities
| * | | Use HTML entitiesErik Lundin2015-01-021-21/+21
|/ / /
* | | Merge pull request #810 from pafcu/aclsortpafcu2015-01-021-2/+5
|\ \ \ | | | | | | | | Sort acl results according to match position (only type='c' for now)
| * | | Sort acl results according to match position (only type='c' for now)Stefan Parviainen2015-01-021-2/+5
| |/ /
* / / syntax issues (with some php versions?), unchecked intvalfriendica2015-01-012-7/+31
|/ /
* | fix shares that are processed with markdown (regression, this was pulled ↵friendica2015-01-011-3/+5
| | | | | | | | from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only)