Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | more work on item table optimisation | redmatrix | 2015-06-10 | 19 | -82/+123 | |
| | | | | ||||||
* | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 7 | -67/+45 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge pull request #346 from solstag/fixattachperms | redmatrix | 2015-06-11 | 1 | -21/+23 | |
| |\ \ \ | | |/ / | |/| | | correctly fix attachment permissions from private mentions | |||||
| | * | | correctly fix attachment permissions from private mentions | Alexandre Hannud Abdo | 2015-06-10 | 1 | -21/+23 | |
| |/ / | | | | | | | | | | by postponing code that removes the attachment tag from the body | |||||
| * | | show login without checking for block_public, local or remote channel | Mario Vavti | 2015-06-10 | 1 | -6/+3 | |
| | | | ||||||
| * | | assign right aside the same width as we have in left aside but hide it on ↵ | Mario Vavti | 2015-06-10 | 4 | -11/+18 | |
| | | | | | | | | | | | | small and xs screens. make aside width a variablee for easier handling. | |||||
| * | | really show login form if it is enabled | Mario Vavti | 2015-06-10 | 1 | -2/+2 | |
| | | | ||||||
| * | | retire old Friendica RINO encryption functions | redmatrix | 2015-06-09 | 1 | -28/+0 | |
| | | | ||||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 6 | -2/+38 | |
|\| | | ||||||
| * | | put mirror_frontpage setting into admin/site | redmatrix | 2015-06-09 | 2 | -0/+4 | |
| | | | ||||||
| * | | toggle diaspora protocol on a per-channel level in addition to the existing ↵ | redmatrix | 2015-06-09 | 4 | -2/+34 | |
| | | | | | | | | | | | | per site setting. Default is enabled if the site setting is enabled. | |||||
| * | | s/broder/border/ | redmatrix | 2015-06-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 17 | -254/+303 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | |||||
| * | | add nomadic identities as webfinger aliases | redmatrix | 2015-06-09 | 2 | -2/+11 | |
| | | | ||||||
| * | | provide a mechanism for loading the frontpage without redirecting. | redmatrix | 2015-06-08 | 1 | -0/+5 | |
| | | | ||||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-08 | 1 | -0/+12 | |
| |\ \ | ||||||
| | * | | css regression fixes | Mario Vavti | 2015-06-08 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | remove debugging | redmatrix | 2015-06-08 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵ | redmatrix | 2015-06-08 | 8 | -18/+52 | |
| |/ / | | | | | | | | | | webpages to be viewed even if site is configured "block public". | |||||
| * | | magic auth issues on dreamhost | redmatrix | 2015-06-07 | 2 | -3/+6 | |
| | | | ||||||
| * | | Merge branch 'frontpage' | redmatrix | 2015-06-07 | 6 | -234/+223 | |
| |\ \ | ||||||
| | * | | make sure these are included | redmatrix | 2015-06-07 | 2 | -0/+189 | |
| | | | | ||||||
| | * | | more frontpage tweaks | redmatrix | 2015-06-07 | 3 | -4/+4 | |
| | | | | ||||||
| | * | | reverse logic of homepage login setting | redmatrix | 2015-06-07 | 3 | -5/+9 | |
| | | | | ||||||
| | * | | frontpage tweaks | redmatrix | 2015-06-07 | 3 | -5/+11 | |
| | | | | ||||||
| | * | | frontpage changes | redmatrix | 2015-06-07 | 2 | -230/+20 | |
| | | | | ||||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-07 | 2 | -7229/+7132 | |
| |\ \ \ | ||||||
| | * | | | Upd NL | jeroenpraat | 2015-06-07 | 2 | -7229/+7132 | |
| | |/ / | ||||||
| * / / | version update | redmatrix | 2015-06-07 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-06 | 16 | -797/+704 | |
|\| | | | | | | | | | | | | | | Conflicts: util/messages.po | |||||
| * | | missing comma | Mario Vavti | 2015-06-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Added translatable strings to the Display Settings page and refreshed ↵ | jeroenpraat | 2015-06-06 | 3 | -4618/+4478 | |
| | | | | | | | | | | | | util/messages.po. | |||||
| * | | css fixes | Mario Vavti | 2015-06-06 | 1 | -17/+9 | |
| | | | ||||||
| * | | whitespace | Mario Vavti | 2015-06-06 | 1 | -169/+175 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-06 | 2 | -175/+176 | |
| |\ \ | ||||||
| | * \ | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-06 | 12 | -415/+498 | |
| | |\ \ | ||||||
| | * | | | string/version update | redmatrix | 2015-06-06 | 2 | -175/+176 | |
| | | | | | ||||||
| * | | | | some cleanup after scheme transition | Mario Vavti | 2015-06-06 | 2 | -196/+19 | |
| | |/ / | |/| | | ||||||
| * | | | More schemas in new format | jeroenpraat | 2015-06-05 | 4 | -119/+114 | |
| | | | | ||||||
| * | | | use the right webpage layout for an installed webpage if it exists | Mario Vavti | 2015-06-04 | 2 | -1/+3 | |
| | | | | ||||||
| * | | | some doco on webpage blocks | Mario Vavti | 2015-06-04 | 1 | -2/+78 | |
| | | | | ||||||
| * | | | Schemas: should be ok now. | jeroenpraat | 2015-06-03 | 7 | -342/+116 | |
| | | | | ||||||
| * | | | 2 more schemas in new format | jeroenpraat | 2015-06-03 | 4 | -239/+473 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | jeroenpraat | 2015-06-03 | 2 | -4/+14 | |
| |\| | | ||||||
| * | | | empty php schema back | jeroenpraat | 2015-06-03 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 10 | -371/+380 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-02 | 5 | -328/+286 | |
| |\| | | ||||||
| | * | | First schema completely to the new format. git-marijus: Can you please ↵ | jeroenpraat | 2015-06-02 | 2 | -123/+237 | |
| | | | | | | | | | | | | | | | | quickly check if I'm doing it right? | |||||
| | * | | update help link | Mario Vavti | 2015-06-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | update comanche doco | Mario Vavti | 2015-06-02 | 2 | -204/+48 | |
| | | | |