Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | updated it with the same text as in assets/home.html | jeroenpraat | 2014-10-04 | 1 | -5/+5 | |
|/ | ||||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-03 | 2 | -5/+6 | |
|\ | ||||||
| * | Merge pull request #612 from beardy-unixer/master | RedMatrix | 2014-10-04 | 1 | -3/+4 | |
| |\ | | | | | | | Set timezone when creating a channel. | |||||
| | * | That's a string, not an integer | Thomas Willingham | 2014-10-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | Set timezone when creating a channel. | Thomas Willingham | 2014-10-03 | 1 | -3/+4 | |
| | | | ||||||
| * | | it seems this is needed also to not allow editing profile photo album | marijus | 2014-10-03 | 1 | -2/+2 | |
| | | | ||||||
* | | | more infrastructure for sharing page design elements | friendica | 2014-10-03 | 1 | -1/+43 | |
|/ / | ||||||
* | | remove the privacy macros in settings and connedit now that we have privacy ↵ | friendica | 2014-10-03 | 2 | -30/+0 | |
| | | | | | | | | roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people. | |||||
* | | more work on shared design elements | friendica | 2014-10-03 | 1 | -1/+7 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-03 | 7 | -119/+165 | |
|\ \ | ||||||
| * \ | Merge pull request #611 from tuscanhobbit/dev | RedMatrix | 2014-10-03 | 1 | -0/+1 | |
| |\ \ | | |/ | |/| | site language in siteinfo/json has been re-added | |||||
| | * | site language in siteinfo/json has been re-added | Paolo Tacconi | 2014-10-02 | 1 | -0/+1 | |
| | | | ||||||
| * | | more work on photos | marijus | 2014-10-02 | 4 | -71/+75 | |
| |/ | ||||||
| * | Merge pull request #610 from tuscanhobbit/dev | RedMatrix | 2014-10-02 | 3 | -48/+89 | |
| |\ | | | | | | | site language wasn't included in siteinfo/json | |||||
| | * | query for statistics are now executed by poller | Paolo Tacconi | 2014-10-02 | 3 | -49/+89 | |
| | | | ||||||
| | * | Merge from master | Paolo Tacconi | 2014-10-02 | 4 | -5/+22 | |
| | |\ | ||||||
| | | * | Rebase from upstream | Paolo Tacconi | 2014-10-02 | 4 | -5/+22 | |
| | | |\ | ||||||
| | * | | | site language was left out of siteinfo | tuscanhobbit | 2014-10-01 | 1 | -0/+1 | |
| | |/ / | ||||||
| | * | | Merge from upstream | tuscanhobbit | 2014-10-01 | 24 | -1380/+2063 | |
| | |\ \ | ||||||
| | * \ \ | Merge from upstream | tuscanhobbit | 2014-09-28 | 14 | -156/+453 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge from origin | tuscanhobbit | 2014-09-28 | 83 | -1956/+2370 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge from origin | tuscanhobbit | 2014-09-22 | 0 | -0/+0 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge from upstream | tuscanhobbit | 2014-09-22 | 156 | -3017/+10141 | |
| | |\ \ \ \ \ \ | ||||||
* | | | | | | | | | rev update | friendica | 2014-10-03 | 3 | -343/+351 | |
| | | | | | | | | | ||||||
* | | | | | | | | | doc updates | friendica | 2014-10-03 | 49 | -355/+1109 | |
|/ / / / / / / / | ||||||
* | | | | | | / | issues with diaspora comment signatures on relayed comments that are relayed ↵ | friendica | 2014-10-02 | 5 | -7/+21 | |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | through a redmatrix site (parent post is redmatrix) and involve a private post. | |||||
* | | | | | | | only auto-follow the site recommendations if creating the first channel for ↵ | friendica | 2014-10-01 | 1 | -1/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | an account. | |||||
* | | | | | | | ability to pre-populate connections for new channels. e.g. "MySpace Tom" | friendica | 2014-10-01 | 4 | -5/+12 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | that's why remove_obsolete_hublocs() isn't telling anybody when it does its ↵ | friendica | 2014-09-30 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | thing, I forgot to uncomment the bit that tells everybody after I tested it. I needed extensive testing to make sure we didn't accidentally wipe out all hublocs everywhere. Testing went fine so I just assumed it was all working as planned; but went back today to find out why I wasn't told of a recent change. | |||||
* | | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-30 | 3 | -3/+13 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #608 from beardy-unixer/master | RedMatrix | 2014-10-01 | 1 | -2/+4 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Pluggable page templates | |||||
| | * | | | | | | Pluggable page templates | Thomas Willingham | 2014-09-29 | 1 | -2/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #609 from tuscanhobbit/dev | RedMatrix | 2014-10-01 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Dev | |||||
| | * | | | | | | | useless file: knownhubs | Paolo Tacconi | 2014-09-30 | 1 | -22/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | added directory status to siteinfo | Paolo Tacconi | 2014-09-30 | 1 | -1/+3 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Added mod returning a list of known hubs, for a lightweight hub crawler | Paolo Tacconi | 2014-09-30 | 1 | -0/+22 | |
| | | | | | | | | | ||||||
| * | | | | | | | | A...typo? Relic of some kind. | Thomas Willingham | 2014-09-30 | 1 | -1/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Couple of site specific files missing from gitignore | Thomas Willingham | 2014-09-30 | 1 | -0/+7 | |
| |/ / / / / / / | ||||||
* / / / / / / / | allow site specific templates, css, js, whatever | friendica | 2014-09-30 | 2 | -1/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-29 | 3 | -0/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | no spaces in file names as requested | Jeroen | 2014-09-30 | 3 | -0/+0 | |
| | | | | | | | | ||||||
* | | | | | | | | allow custom role permissions and fix site timezone. | friendica | 2014-09-29 | 4 | -5/+16 | |
| | | | | | | | | ||||||
* | | | | | | | | implement a "powered-by" but leave it turned off until somebody with a good ↵ | friendica | 2014-09-29 | 6 | -1/+38 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | eye for layout can figure out where best to put it. | |||||
* | | | | | | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-09-29 | 13 | -1381/+2068 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | ok, last commit so far on the simple schemas | Jeroen | 2014-09-29 | 2 | -10/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | transp back | Jeroen | 2014-09-29 | 3 | -10/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | minor modification simple black on white schema. | Jeroen | 2014-09-29 | 1 | -10/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | Added 3 new schemas, all named 'simple' in 3 variants. Please enjoy. | Jeroen | 2014-09-29 | 3 | -0/+546 | |
| |/ / / / / / | ||||||
| * | | | | | | Merge pull request #607 from tuscanhobbit/dev | RedMatrix | 2014-09-29 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Numbers shouldn't be strings | |||||
| | * | | | | | | Numbers shouldn't be strings | Paolo Tacconi | 2014-09-29 | 1 | -2/+2 | |
| |/ / / / / / |