Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 12 | -4625/+4679 | |
|\| | | | | | ||||||
| * | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-04 | 10 | -4623/+4677 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | update NL and text-background-fix in chat for alternatives schemas | Jeroen | 2015-01-03 | 8 | -4620/+4672 | |
| | * | | | | | provide some info for buttons | marijus | 2015-01-03 | 2 | -3/+5 | |
| * | | | | | | remove hard-coded url to caterva.eu from events code. | friendica | 2015-01-04 | 2 | -2/+2 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 0 | -0/+0 | |
|\| | | | | | ||||||
| * | | | | | no newline at end of file | friendica | 2015-01-02 | 1 | -1/+1 | |
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 4 | -26/+46 | |
|\| | | | | | ||||||
| * | | | | | some work on the edit connection workflow explanation and connedit page. This... | friendica | 2015-01-02 | 4 | -26/+46 | |
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 63 | -2458/+2562 | |
|\| | | | | | ||||||
| * | | | | | doc updates | friendica | 2015-01-02 | 63 | -2458/+2562 | |
* | | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-02 | 9 | -106/+89 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #813 from pafcu/checkboxes | RedMatrix | 2015-01-03 | 7 | -83/+63 | |
| |\| | | | | ||||||
| | * | | | | Reworked switch to also display text | Stefan Parviainen | 2015-01-02 | 7 | -83/+63 | |
| * | | | | | Merge pull request #812 from f03el/master | RedMatrix | 2015-01-03 | 1 | -21/+21 | |
| |\ \ \ \ \ |