aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add blueimp-jquery-file-upload libraryfriendica2014-10-0556-0/+10272
|
* add 'nopush' option to the post API so somebody could bulk load a bunch of ↵friendica2014-10-052-10/+17
| | | | existing content via the API without invoking the notifier and sending each out as a fresh post.
* network page default optionfriendica2014-10-042-2/+5
|
* +urls to pubsites and installjeroenpraat2014-10-041-0/+2
|
* updated it with the same text as in assets/home.htmljeroenpraat2014-10-041-5/+5
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-10-032-5/+6
|\
| * Merge pull request #612 from beardy-unixer/masterRedMatrix2014-10-041-3/+4
| |\ | | | | | | Set timezone when creating a channel.
| | * That's a string, not an integerThomas Willingham2014-10-031-1/+1
| | |
| | * Set timezone when creating a channel.Thomas Willingham2014-10-031-3/+4
| | |
| * | it seems this is needed also to not allow editing profile photo albummarijus2014-10-031-2/+2
| | |
* | | more infrastructure for sharing page design elementsfriendica2014-10-031-1/+43
|/ /
* | remove the privacy macros in settings and connedit now that we have privacy ↵friendica2014-10-032-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 elementsfriendica2014-10-031-1/+7
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-037-119/+165
|\ \
| * \ Merge pull request #611 from tuscanhobbit/devRedMatrix2014-10-031-0/+1
| |\ \ | | |/ | |/| site language in siteinfo/json has been re-added
| | * site language in siteinfo/json has been re-addedPaolo Tacconi2014-10-021-0/+1
| | |
| * | more work on photosmarijus2014-10-024-71/+75
| |/
| * Merge pull request #610 from tuscanhobbit/devRedMatrix2014-10-023-48/+89
| |\ | | | | | | site language wasn't included in siteinfo/json
| | * query for statistics are now executed by pollerPaolo Tacconi2014-10-023-49/+89
| | |
| | * Merge from masterPaolo Tacconi2014-10-024-5/+22
| | |\
| | | * Rebase from upstreamPaolo Tacconi2014-10-024-5/+22
| | | |\
| | * | | site language was left out of siteinfotuscanhobbit2014-10-011-0/+1
| | |/ /
| | * | Merge from upstreamtuscanhobbit2014-10-0124-1380/+2063
| | |\ \
| | * \ \ Merge from upstreamtuscanhobbit2014-09-2814-156/+453
| | |\ \ \
| | * \ \ \ Merge from origintuscanhobbit2014-09-2883-1956/+2370
| | |\ \ \ \
| | * \ \ \ \ Merge from origintuscanhobbit2014-09-220-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge from upstreamtuscanhobbit2014-09-22156-3017/+10141
| | |\ \ \ \ \ \
* | | | | | | | | rev updatefriendica2014-10-033-343/+351
| | | | | | | | |
* | | | | | | | | doc updatesfriendica2014-10-0349-355/+1109
|/ / / / / / / /
* | | | | | | / issues with diaspora comment signatures on relayed comments that are relayed ↵friendica2014-10-025-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 ↵friendica2014-10-011-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | an account.
* | | | | | | ability to pre-populate connections for new channels. e.g. "MySpace Tom"friendica2014-10-014-5/+12
| |_|_|_|_|/ |/| | | | |
* | | | | | that's why remove_obsolete_hublocs() isn't telling anybody when it does its ↵friendica2014-09-301-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_mergefriendica2014-09-303-3/+13
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #608 from beardy-unixer/masterRedMatrix2014-10-011-2/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Pluggable page templates
| | * | | | | | Pluggable page templatesThomas Willingham2014-09-291-2/+4
| | | | | | | |
| * | | | | | | Merge pull request #609 from tuscanhobbit/devRedMatrix2014-10-011-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Dev
| | * | | | | | | useless file: knownhubsPaolo Tacconi2014-09-301-22/+0
| | | | | | | | |
| | * | | | | | | added directory status to siteinfoPaolo Tacconi2014-09-301-1/+3
| | | | | | | | |
| | * | | | | | | Added mod returning a list of known hubs, for a lightweight hub crawlerPaolo Tacconi2014-09-301-0/+22
| | | | | | | | |
| * | | | | | | | A...typo? Relic of some kind.Thomas Willingham2014-09-301-1/+0
| | | | | | | | |
| * | | | | | | | Couple of site specific files missing from gitignoreThomas Willingham2014-09-301-0/+7
| |/ / / / / / /
* / / / / / / / allow site specific templates, css, js, whateverfriendica2014-09-302-1/+2
|/ / / / / / /
* | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-293-0/+0
|\ \ \ \ \ \ \
| * | | | | | | no spaces in file names as requestedJeroen2014-09-303-0/+0
| | | | | | | |
* | | | | | | | allow custom role permissions and fix site timezone.friendica2014-09-294-5/+16
| | | | | | | |
* | | | | | | | implement a "powered-by" but leave it turned off until somebody with a good ↵friendica2014-09-296-1/+38
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | eye for layout can figure out where best to put it.
* | | | | | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-09-2913-1381/+2068
|\ \ \ \ \ \ \
| * | | | | | | ok, last commit so far on the simple schemasJeroen2014-09-292-10/+10
| | | | | | | |
| * | | | | | | transp backJeroen2014-09-293-10/+10
| | | | | | | |