Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 40ee0d41dc fix deleting of album for remote channel Mario Vavti 2015-06-16 12:54:29 +02:00
• 93f48cd8bb make photo upload work for remote channels with perms Mario Vavti 2015-06-16 12:18:50 +02:00
• bc72d3fd26 move profile photos to new methods redmatrix 2015-06-15 23:37:51 -07:00
• bdedda7c6b fix attachment permissions when they also contain an image. redmatrix 2015-06-15 20:43:49 -07:00
• 2adc7a51ad photo upload: pass in the contact_allow and resource_id via include/attach.php redmatrix 2015-06-15 19:52:17 -07:00
• 8c7472c6c3 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-15 17:30:08 -07:00
• 859a2ac8ef DB changes for some channel flags redmatrix 2015-06-15 17:28:52 -07:00
• e0779e32b4 Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-06-15 21:48:07 +02:00
• 7e3aac6d18 update spin.js Mario Vavti 2015-06-15 21:47:29 +02:00
• caf0cd3dbb Update Dutch language strings jeroenpraat 2015-06-15 16:41:03 +02:00
• 905cd1da5b do not allow/show acl button on photo edit if not owner Mario Vavti 2015-06-15 13:04:16 +02:00
• 91d92fe6fc un-maintainable - let it go. redmatrix 2015-06-14 22:29:25 -07:00
• d2178e43f6 sql errors after last major edit adventure redmatrix 2015-06-14 21:19:13 -07:00
• be0459a98b convert the abook fields redmatrix 2015-06-14 21:08:00 -07:00
• f0b255b1a9 more file/photo merge work redmatrix 2015-06-14 17:28:51 -07:00
• 9642728e7d first cut at merging files and photos, not yet well integrated but they are integrated redmatrix 2015-06-14 16:50:24 -07:00
• 23f7f60bf7 make new os_storage flag work redmatrix 2015-06-14 15:59:11 -07:00
• 187a7a56c2 version update redmatrix 2015-06-14 15:57:45 -07:00
• b7be79c5e7 isolate the os_storage flag redmatrix 2015-06-13 15:57:28 -07:00
• 3f0009ccd7 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-13 15:02:51 -07:00
• 8c4c0246f0 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-13 15:00:51 -07:00
• d01fbe521f weekly string update redmatrix 2015-06-13 15:00:22 -07:00
• 50e87dd1e1 Merge pull request #348 from unary/nginxconfig redmatrix 2015-06-13 17:56:00 +10:00
• 053d4547fe nginx config change from Thomas Michael Johnston 2015-06-13 00:24:11 -04:00
• e838647e3a Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-11 22:48:01 -07:00
• 6562820175 make cloud work again redmatrix 2015-06-11 22:47:45 -07:00
• 485b19958e don't provide a connect button on the sys channel profile sidebar redmatrix 2015-06-11 22:46:37 -07:00
• 41085ae03f start on the DAV/photos merger redmatrix 2015-06-11 22:32:08 -07:00
• 5733491ac8 more work on items and redmatrix 2015-06-11 17:56:56 -07:00
• 8812f183a2 the hubzilla version of this function redmatrix 2015-06-11 16:11:59 -07:00
• bc8840eab5 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-11 15:53:06 -07:00
• dc7de12991 hubzilla compatibility function redmatrix 2015-06-11 15:52:37 -07:00
• aac9d60f2d Merge pull request #347 from tuscanhobbit/dev Paolo T 2015-06-11 15:54:35 +02:00
• 98b0cfb413 updated italian strings Paolo Tacconi 2015-06-11 15:47:15 +02:00
• 8c4b337918 set width for region_3 only if center page content is set Mario Vavti 2015-06-11 13:07:45 +02:00
• c8fe408a62 fix rendering of affinity slider Mario Vavti 2015-06-11 11:35:21 +02:00
• b2c5020af7 diaspora disallowed by default redmatrix 2015-06-10 18:51:39 -07:00
• bc1b7afc85 start to partition the dav redmatrix 2015-06-10 18:11:15 -07:00
• a14d2de1f0 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-10 17:58:02 -07:00
• 04551ac32b Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-10 17:45:04 -07:00
• 9a5d9fb8c5 put block_public back where it is needed, which is in mod_public and not mod_home redmatrix 2015-06-10 17:44:04 -07:00
• ca870dbf31 more work on item table optimisation redmatrix 2015-06-10 16:59:04 -07:00
• 2128d5a256 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-10 15:47:23 -07:00
• 52ddbd1add Merge pull request #346 from solstag/fixattachperms redmatrix 2015-06-11 06:27:24 +10:00
• a31fdd3fbb correctly fix attachment permissions from private mentions Alexandre Hannud Abdo 2015-06-10 15:37:10 -03:00
• edd2d1e8d4 show login without checking for block_public, local or remote channel Mario Vavti 2015-06-10 13:24:16 +02:00
• 50ac9378e3 assign right aside the same width as we have in left aside but hide it on small and xs screens. make aside width a variablee for easier handling. Mario Vavti 2015-06-10 13:08:17 +02:00
• 20a317b5b7 really show login form if it is enabled Mario Vavti 2015-06-10 11:58:45 +02:00
• 29d9d38d7f retire old Friendica RINO encryption functions redmatrix 2015-06-09 22:24:24 -07:00
• eb6a1f8387 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-09 19:39:21 -07:00
• 9592f7f3e6 put mirror_frontpage setting into admin/site redmatrix 2015-06-09 19:37:12 -07:00
• d08c43d80c toggle diaspora protocol on a per-channel level in addition to the existing per site setting. Default is enabled if the site setting is enabled. redmatrix 2015-06-09 18:50:11 -07:00
• faa7f97c25 s/broder/border/ redmatrix 2015-06-09 16:52:53 -07:00
• 03357481f7 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-09 16:52:00 -07:00
• 805e2a28ee add nomadic identities as webfinger aliases redmatrix 2015-06-09 16:29:51 -07:00
• 54b61f817d provide a mechanism for loading the frontpage without redirecting. redmatrix 2015-06-08 21:19:05 -07:00
• 91249c4bfa Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-08 16:57:49 -07:00
• 507e10fa45 remove debugging redmatrix 2015-06-08 16:57:30 -07:00
• 39f0e6fe62 add site_dead flag to prevent delivery to dead sites. Allow sys channel webpages to be viewed even if site is configured "block public". redmatrix 2015-06-08 16:55:17 -07:00
• a6cedf0953 css regression fixes Mario Vavti 2015-06-08 19:27:16 +02:00
• 5b482c1daf magic auth issues on dreamhost redmatrix 2015-06-07 23:04:46 -07:00
• 10e88a3e45 Merge branch 'frontpage' redmatrix 2015-06-07 21:38:11 -07:00
• 9823541c4b make sure these are included redmatrix 2015-06-07 21:36:50 -07:00
• 77314bfa1c Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-07 18:59:48 -07:00
• 3c5a5a9ebf more frontpage tweaks redmatrix 2015-06-07 18:59:14 -07:00
• 60cfea5d1f reverse logic of homepage login setting redmatrix 2015-06-07 18:27:05 -07:00
• 0537ff1e4a frontpage tweaks redmatrix 2015-06-07 18:15:26 -07:00
• 65bea5e02c frontpage changes redmatrix 2015-06-07 16:19:59 -07:00
• 04c4ad9448 version update redmatrix 2015-06-07 15:15:24 -07:00
• fd73ffe291 Upd NL jeroenpraat 2015-06-07 16:39:00 +02:00
• ec1dcb8f2e Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-06 17:31:22 -07:00
• f5e439236c missing comma Mario Vavti 2015-06-06 20:23:00 +02:00
• 93237f8d0a Added translatable strings to the Display Settings page and refreshed util/messages.po. jeroenpraat 2015-06-06 19:49:30 +02:00
• 2c52be8780 css fixes Mario Vavti 2015-06-06 17:05:38 +02:00
• d60c2b1621 whitespace Mario Vavti 2015-06-06 15:51:15 +02:00
• 1d80c33207 Merge branch 'master' of https://github.com/redmatrix/redmatrix Mario Vavti 2015-06-06 15:06:48 +02:00
• dff402293f some cleanup after scheme transition Mario Vavti 2015-06-06 15:06:27 +02:00
• 3fc5b854cb Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-06 00:06:44 -07:00
• b832444dc2 string/version update redmatrix 2015-06-06 00:06:26 -07:00
• f51cfa6960 More schemas in new format jeroenpraat 2015-06-05 21:15:21 +02:00
• d84f77bbc6 use the right webpage layout for an installed webpage if it exists Mario Vavti 2015-06-04 23:04:58 +02:00
• 33a122aaa8 some doco on webpage blocks Mario Vavti 2015-06-04 22:27:55 +02:00
• 6e336d680d Schemas: should be ok now. jeroenpraat 2015-06-03 22:53:48 +02:00
• 03361acce5 2 more schemas in new format jeroenpraat 2015-06-03 15:45:50 +02:00
• 83d42710df Merge branch 'master' of https://github.com/redmatrix/redmatrix jeroenpraat 2015-06-03 13:58:18 +02:00
• 76d7278c0a empty php schema back jeroenpraat 2015-06-03 13:57:10 +02:00
• 7cbc504874 Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-06-02 17:47:47 -07:00
• 86ff31f500 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-06-02 17:46:47 -07:00
• b2fde73952 asjld work redmatrix 2015-06-02 17:46:22 -07:00
• 89fbd5c0f6 First schema completely to the new format. git-marijus: Can you please quickly check if I'm doing it right? jeroenpraat 2015-06-02 23:22:12 +02:00
• 6277fb76dd update help link Mario Vavti 2015-06-02 11:09:57 +02:00
• 12408ba181 update comanche doco Mario Vavti 2015-06-02 10:59:57 +02:00
• e3606ec56f move the photo and attachment permission syncing past the tag replacement so that attachments get the correct permissions when private mentions are used. redmatrix 2015-06-01 16:26:12 -07:00
• c1e139a550 error in directory bbcode image filter redmatrix 2015-05-31 22:22:37 -07:00
• 84c085dcd7 bare bones ASLD redmatrix 2015-05-31 22:16:14 -07:00
• f3b95f591a Merge branch 'master' of https://github.com/redmatrix/redmatrix redmatrix 2015-05-31 19:26:00 -07:00
• 5cc5e0fafd some basic background work for activitystreams-json-ld-2.0 conversions redmatrix 2015-05-31 18:35:35 -07:00
• 0df0fb4b46 fix unable to crop profile pic on postgres Habeas Codice 2015-05-30 19:49:32 -07:00
• cd3284d081 Merge https://github.com/redmatrix/redmatrix into pending_merge redmatrix 2015-05-30 15:04:11 -07:00
• edd228decb strip images from directory text entries redmatrix 2015-05-30 15:03:44 -07:00