 Michael Johnston
|
5eba3c17cb
|
typo
|
2014-10-03 20:36:52 -04:00 |
|
 friendica
|
f618e02117
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-03 16:52:01 -07:00 |
|
|
friendica
|
ec604a4158
|
more infrastructure for sharing page design elements
|
2014-10-03 16:51:22 -07:00 |
|
|
RedMatrix
|
62f7bf51ba
|
Merge pull request #612 from beardy-unixer/master
Set timezone when creating a channel.
|
2014-10-04 07:56:42 +10:00 |
|
 marijus
|
55b75381ad
|
it seems this is needed also to not allow editing profile photo album
|
2014-10-03 19:15:37 +02:00 |
|
 Thomas Willingham
|
557894bc01
|
That's a string, not an integer
|
2014-10-03 15:16:05 +01:00 |
|
|
friendica
|
e2f45a76b1
|
remove the privacy macros in settings and connedit now that we have privacy 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.
|
2014-10-03 04:54:27 -07:00 |
|
|
friendica
|
a177cd1bd4
|
more work on shared design elements
|
2014-10-03 04:05:05 -07:00 |
|
|
friendica
|
328d72971d
|
Merge https://github.com/friendica/red into pending_merge
|
2014-10-03 03:35:50 -07:00 |
|
|
friendica
|
2bd4b36238
|
rev update
|
2014-10-03 03:35:01 -07:00 |
|
|
friendica
|
f5623ae11d
|
doc updates
|
2014-10-03 03:34:50 -07:00 |
|
|
RedMatrix
|
dfd39ebb3c
|
Merge pull request #611 from tuscanhobbit/dev
site language in siteinfo/json has been re-added
|
2014-10-03 18:51:16 +10:00 |
|
|
Thomas Willingham
|
09e0b4e2a1
|
Set timezone when creating a channel.
|
2014-10-03 00:57:07 +01:00 |
|
|
marijus
|
df70c2c9b6
|
more work on photos
|
2014-10-02 21:04:50 +02:00 |
|
 Paolo Tacconi
|
9495aba499
|
site language in siteinfo/json has been re-added
|
2014-10-02 16:25:34 +02:00 |
|
|
RedMatrix
|
a932c20dc4
|
Merge pull request #610 from tuscanhobbit/dev
site language wasn't included in siteinfo/json
|
2014-10-02 23:05:59 +10:00 |
|
|
Paolo Tacconi
|
15c1529e83
|
query for statistics are now executed by poller
|
2014-10-02 13:43:48 +02:00 |
|
|
friendica
|
16b94f1dc0
|
issues with diaspora comment signatures on relayed comments that are relayed through a redmatrix site (parent post is redmatrix) and involve a private post.
|
2014-10-02 02:43:07 -07:00 |
|
|
Paolo Tacconi
|
9cebe8ccf0
|
Merge from master
|
2014-10-02 11:31:56 +02:00 |
|
|
Paolo Tacconi
|
cc95f91c54
|
Rebase from upstream
|
2014-10-02 11:31:51 +02:00 |
|
|
friendica
|
baa0b0f393
|
only auto-follow the site recommendations if creating the first channel for an account.
|
2014-10-01 15:40:19 -07:00 |
|
|
friendica
|
467c6c72f0
|
ability to pre-populate connections for new channels. e.g. "MySpace Tom"
|
2014-10-01 14:48:08 -07:00 |
|
 tuscanhobbit
|
b39cd90e07
|
site language was left out of siteinfo
|
2014-10-01 20:11:11 +02:00 |
|
|
tuscanhobbit
|
9cce852ac7
|
Merge from upstream
|
2014-10-01 19:26:21 +02:00 |
|
|
friendica
|
f19d718631
|
that's why remove_obsolete_hublocs() isn't telling anybody when it does its 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.
|
2014-09-30 23:41:50 -07:00 |
|
|
friendica
|
79f1d48e19
|
Merge https://github.com/friendica/red into pending_merge
|
2014-09-30 21:31:31 -07:00 |
|
|
friendica
|
cb44d015f3
|
allow site specific templates, css, js, whatever
|
2014-09-30 21:30:27 -07:00 |
|
|
RedMatrix
|
e12872fdae
|
Merge pull request #608 from beardy-unixer/master
Pluggable page templates
|
2014-10-01 14:11:16 +10:00 |
|
|
RedMatrix
|
bfa4cc8678
|
Merge pull request #609 from tuscanhobbit/dev
Dev
|
2014-10-01 14:09:12 +10:00 |
|
|
Thomas Willingham
|
1a4a248a26
|
A...typo? Relic of some kind.
|
2014-09-30 21:09:11 +01:00 |
|
|
Thomas Willingham
|
49b351d86a
|
Couple of site specific files missing from gitignore
|
2014-09-30 21:08:09 +01:00 |
|
|
Paolo Tacconi
|
bfeac36702
|
useless file: knownhubs
|
2014-09-30 13:32:08 +02:00 |
|
|
Paolo Tacconi
|
1cc5babd39
|
added directory status to siteinfo
|
2014-09-30 13:30:04 +02:00 |
|
|
Paolo Tacconi
|
018f1b813c
|
Added mod returning a list of known hubs, for a lightweight hub crawler
|
2014-09-30 12:24:49 +02:00 |
|
|
friendica
|
cef570991a
|
Merge https://github.com/friendica/red into pending_merge
|
2014-09-29 23:37:16 -07:00 |
|
|
friendica
|
f8468b4c3a
|
allow custom role permissions and fix site timezone.
|
2014-09-29 23:36:41 -07:00 |
|
 Jeroen
|
0283720302
|
no spaces in file names as requested
|
2014-09-30 05:48:29 +00:00 |
|
|
friendica
|
5292e3a100
|
implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it.
|
2014-09-29 21:58:35 -07:00 |
|
|
Thomas Willingham
|
7c3b428e67
|
Merge branch 'master' of https://github.com/friendica/red
|
2014-09-29 19:12:12 +01:00 |
|
|
Thomas Willingham
|
90378e8ef8
|
Silence insanely noisy log - should probably stick this in a dlogger
if we need it - we're getting literally hundreds of thousands of these.
|
2014-09-29 19:06:43 +01:00 |
|
|
Jeroen
|
43d2a8ceae
|
ok, last commit so far on the simple schemas
|
2014-09-29 15:37:50 +00:00 |
|
|
Jeroen
|
6c4a54dbfd
|
transp back
|
2014-09-29 15:20:04 +00:00 |
|
|
Jeroen
|
67035a5507
|
minor modification simple black on white schema.
|
2014-09-29 15:06:47 +00:00 |
|
|
Jeroen
|
d33b9e3a91
|
Added 3 new schemas, all named 'simple' in 3 variants. Please enjoy.
|
2014-09-29 14:23:26 +00:00 |
|
|
Thomas Willingham
|
9de5b6b905
|
Pluggable page templates
|
2014-09-29 15:13:39 +01:00 |
|
|
RedMatrix
|
f7595cc11a
|
Merge pull request #607 from tuscanhobbit/dev
Numbers shouldn't be strings
|
2014-09-29 20:43:44 +10:00 |
|
|
Paolo Tacconi
|
d09003dcff
|
Numbers shouldn't be strings
|
2014-09-29 10:05:31 +02:00 |
|
|
Paolo T
|
3e9fb3be5a
|
Merge pull request #606 from tuscanhobbit/dev
Italian strings updated
|
2014-09-29 10:02:44 +02:00 |
|
|
Paolo Tacconi
|
a30af47ed7
|
Italian strings updated
|
2014-09-29 10:01:34 +02:00 |
|
|
RedMatrix
|
6370713cc1
|
Merge pull request #605 from habeascodice/master
2 minor bug-fixes, a line of docu, and a call_hooks() hook
|
2014-09-29 13:08:56 +10:00 |
|