| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | | | | | Update jquery.timeago.js to add support for dispose action | Stefan Parviainen | 2015-01-06 | 1 | -139/+208 |
| | | |_|_|_|/
| | |/| | | | |
|
* | | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 6 | -6/+412 |
|\| | | | | | |
|
| * | | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-06 | 5 | -5/+411 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | add some style to divgrowmore | marijus | 2015-01-06 | 1 | -1/+1 |
| | | |/ / / /
| | |/| | | | |
|
| | * | | | | | Merge pull request #823 from einervonvielen/dev_beginning | mrjive | 2015-01-06 | 2 | -0/+405 |
| | |\ \ \ \ \ |
|
| | | * | | | | | spelling | Einer von Vielen | 2015-01-06 | 1 | -2/+2 |
| | | * | | | | | added modification of branch | Einer von Vielen | 2015-01-06 | 1 | -53/+64 |
| | | * | | | | | Mainly it shows how to debug the red matrix (php) in a virtual machine and co... | Einer von Vielen | 2015-01-06 | 1 | -0/+393 |
| | | * | | | | | Mainly it shows how to debug the red matrix (php) in a virtual machine and co... | Einer von Vielen | 2015-01-06 | 1 | -0/+1 |
| | * | | | | | | Merge pull request #822 from pafcu/master | pafcu | 2015-01-06 | 2 | -4/+5 |
| | |\ \ \ \ \ \
| | | |_|/ / / /
| | |/| | / / /
| | | | |/ / /
| | | |/| | | |
|
| | | * | | | | Fix bug in readmore.js | Stefan Parviainen | 2015-01-06 | 1 | -3/+4 |
| | | * | | | | Add title to bb_observer tags to further clarify a bit what's going on | Stefan Parviainen | 2015-01-06 | 1 | -1/+1 |
| | |/ / / / |
|
| * | | | | | revup | friendica | 2015-01-06 | 1 | -1/+1 |
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-05 | 2 | -35/+48 |
|\| | | | | |
|
| * | | | | | regression: need float clear on manage page so footer doesn't end up floated, | friendica | 2015-01-05 | 2 | -35/+48 |
| |/ / / / |
|
* | | | | | undo these bits of trinidad - we're going to do things differently | friendica | 2015-01-05 | 4 | -5/+4 |
* | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-05 | 1 | -0/+2 |
|\| | | | |
|
| * | | | | detect https coming through reverse proxy or load balancer using x-forwarded-... | friendica | 2015-01-05 | 1 | -0/+2 |
* | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-05 | 213 | -15617/+4152 |
|\| | | | |
|
| * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-05 | 212 | -15616/+4151 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge pull request #820 from pafcu/nomigrate | RedMatrix | 2015-01-06 | 212 | -15616/+4151 |
| | |\ \ \ \ |
|
| | | * | | | | Remove unneeded divgrow library | Stefan Parviainen | 2015-01-05 | 4 | -136/+0 |
| | | * | | | | Unbreak readmore | Stefan Parviainen | 2015-01-05 | 1 | -3/+5 |
| | | * | | | | Make slider less ugly | Stefan Parviainen | 2015-01-05 | 1 | -0/+2 |
| | | * | | | | Remove reference to non-existing colorbox.css | Stefan Parviainen | 2015-01-05 | 1 | -1/+0 |
| | | * | | | | Fix error with undefined profile_uid | Stefan Parviainen | 2015-01-05 | 1 | -0/+1 |
| | | * | | | | Remove some unneeded libraries | Stefan Parviainen | 2015-01-05 | 87 | -14625/+0 |
| | | * | | | | Replace fancybox with colorbox | Stefan Parviainen | 2015-01-05 | 101 | -716/+1522 |
| | | * | | | | Update jGrowl | Stefan Parviainen | 2015-01-05 | 3 | -148/+4 |
| | | * | | | | Replace jslider with jRange | Stefan Parviainen | 2015-01-05 | 17 | -6/+2148 |
| | | * | | | | Replace divgrow with more modern readmore.js | Stefan Parviainen | 2015-01-05 | 4 | -7/+495 |
| | |/ / / / |
|
| * / / / / | revup | friendica | 2015-01-05 | 1 | -1/+1 |
| |/ / / / |
|
* | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+1 |
|\| | | | |
|
| * | | | | regression: autocomplete hovertip with url/address missing - useful for ident... | friendica | 2015-01-04 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 2 | -2/+6 |
|\| | | | |
|
| * | | | | Merge pull request #819 from pafcu/acl | pafcu | 2015-01-05 | 2 | -2/+6 |
| |\ \ \ \ |
|
| | * | | | | Fix initEditor on non-wall pages | Stefan Parviainen | 2015-01-05 | 2 | -2/+6 |
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+1 |
|\| | | | | |
|
| * | | | | | the last checkin removed hostname from the address for autocomplete searches.... | friendica | 2015-01-04 | 1 | -1/+1 |
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 2 | -2/+2 |
|\| | | | | |
|
| * | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-04 | 1 | -1/+1 |
| |\ \ \ \ \ |
|
| | * | | | | | Merge pull request #817 from pafcu/acl | pafcu | 2015-01-04 | 1 | -1/+1 |
| | |\| | | | |
|
| | | * | | | | Fix height calculation in acl.js | Stefan Parviainen | 2015-01-04 | 1 | -1/+1 |
| * | | | | | | only check the LHS of xchan_addr for autocomplete, don't match on the hostname. | friendica | 2015-01-04 | 1 | -1/+1 |
| |/ / / / / |
|
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 6 | -81/+89 |
|\| | | | | |
|
| * | | | | | Merge pull request #816 from pafcu/acl | RedMatrix | 2015-01-05 | 5 | -80/+88 |
| |\| | | | |
|
| | * | | | | Typo | Stefan Parviainen | 2015-01-04 | 1 | -3/+3 |
| | * | | | | Sorting of autocomplete | Stefan Parviainen | 2015-01-04 | 83 | -7141/+7366 |
| | |\ \ \ \ |
|
| | * | | | | | Autocmplete suggestions for non-local users, also suggest from visited channe... | Stefan Parviainen | 2015-01-04 | 5 | -80/+68 |
| * | | | | | | Fix wrong require | Stefan Parviainen | 2015-01-04 | 1 | -1/+1 |
| | |/ / / /
| |/| | | | |
|