Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | zrl and zmg are back | Christian Vogeley | 2014-03-09 | 1 | -2/+1 |
* | merge | Christian Vogeley | 2014-03-09 | 335 | -4412/+11486 |
|\ | |||||
| * | collapse the advanced directory search so that folks who think they're advanc... | friendica | 2014-03-08 | 2 | -2/+6 |
| * | advanced search front-end | friendica | 2014-03-08 | 4 | -2/+19 |
| * | back-end for advanced directory search | friendica | 2014-03-08 | 1 | -15/+98 |
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-08 | 4 | -4/+29 |
| |\ | |||||
| | * | Merge pull request #359 from beardy-unixer/master | friendica | 2014-03-09 | 1 | -1/+10 |
| | |\ | |||||
| | | * | is_developer() for those awkward "Don't touch this yet unless | Thomas Willingham | 2014-03-08 | 1 | -1/+10 |
| | * | | Merge pull request #358 from git-marijus/master | friendica | 2014-03-09 | 3 | -3/+19 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | style fixes | marijus | 2014-03-08 | 3 | -3/+19 |
| | |/ | |||||
| * / | incorrect webfinger link per fabrixxm | friendica | 2014-03-08 | 2 | -2/+2 |
| |/ | |||||
| * | missing quote | friendica | 2014-03-07 | 1 | -1/+1 |
| * | Merge pull request #357 from beardy-unixer/master | friendica | 2014-03-08 | 2 | -0/+10 |
| |\ | |||||
| | * | Create a sys chan for hubs that already exist too. | Thomas Willingham | 2014-03-07 | 1 | -0/+7 |
| | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-03-07 | 6 | -35/+51 |
| | |\ | |||||
| | * | | Actually create syschan during install | Thomas Willingham | 2014-03-07 | 1 | -0/+3 |
| * | | | showwarning when manually changing also | friendica | 2014-03-07 | 1 | -0/+7 |
| * | | | notify when permissions change and haven't been saved. | friendica | 2014-03-07 | 5 | -1/+16 |
| * | | | start new connections out with even more sane defaults than before by pre-fil... | friendica | 2014-03-07 | 3 | -1/+10 |
| * | | | When approving a connection automatically select Full Sharing. | friendica | 2014-03-07 | 1 | -0/+6 |
| * | | | doc update | friendica | 2014-03-07 | 134 | -1416/+2620 |
| | |/ | |/| | |||||
| * | | Merge pull request #356 from git-marijus/master | friendica | 2014-03-08 | 6 | -35/+51 |
| |\ \ | | |/ | |/| | |||||
| | * | fix of fix | marijus | 2014-03-07 | 1 | -1/+1 |
| | * | fix | marijus | 2014-03-07 | 1 | -2/+1 |
| | * | thats better | marijus | 2014-03-07 | 1 | -1/+1 |
| | * | probably should indicate the appearence of aside visualy somehow | marijus | 2014-03-07 | 2 | -5/+10 |
| | * | might be needed by not local users aswell | marijus | 2014-03-07 | 1 | -2/+0 |
| | * | remove aside on navbar collapse and add button to toggle visibility | marijus | 2014-03-07 | 6 | -35/+49 |
| * | | Typo in database.sql | Thomas Willingham | 2014-03-07 | 1 | -1/+1 |
| |/ | |||||
| * | typo | friendica | 2014-03-06 | 1 | -1/+1 |
| * | bring friends back | friendica | 2014-03-06 | 5 | -15/+22 |
| * | background image | friendica | 2014-03-05 | 2 | -0/+13 |
| * | more stuff | friendica | 2014-03-05 | 1 | -5/+12 |
| * | more teeny word smoothing | friendica | 2014-03-05 | 1 | -1/+1 |
| * | more readability issues | friendica | 2014-03-05 | 1 | -1/+1 |
| * | don't context switch between singular/plural so much | friendica | 2014-03-05 | 1 | -1/+1 |
| * | minor readability changes | friendica | 2014-03-05 | 1 | -2/+2 |
| * | make colorbox work again - it worked on the test site but not in production | friendica | 2014-03-05 | 2 | -7/+9 |
| * | missing mod/block | friendica | 2014-03-05 | 1 | -0/+86 |
| * | assets update | friendica | 2014-03-05 | 2 | -45/+138 |
| * | Merge https://github.com/friendica/red into zpull | friendica | 2014-03-05 | 2 | -8/+12 |
| |\ | |||||
| | * | Merge pull request #355 from git-marijus/master | friendica | 2014-03-06 | 2 | -8/+12 |
| | |\ | |||||
| | | * | improve navbar collapsed state a little | marijus | 2014-03-05 | 2 | -8/+12 |
| | | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-03-05 | 28 | -59/+340 |
| | | |\ | | | |/ | | |/| | |||||
| | | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-03-04 | 23 | -1072/+1289 |
| | | |\ | |||||
| | | * \ | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-03-03 | 2 | -1/+9 |
| | | |\ \ | |||||
| * | | | | | add new template | friendica | 2014-03-05 | 1 | -0/+18 |
| * | | | | | lots of little fixes to blocks | friendica | 2014-03-05 | 2 | -51/+42 |
| |/ / / / | |||||
| * | | | | add clock widget and correct some doco | friendica | 2014-03-05 | 4 | -8/+68 |
| * | | | | move language selector to a module | friendica | 2014-03-05 | 6 | -11/+10 |