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

• d54d62b601 Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-10-11 15:42:52 +01:00
• d132646915 Unbreak webpages Thomas Willingham 2014-10-11 15:42:31 +01:00
• 2ddd022540 +1 Jeroen 2014-10-11 14:39:56 +00:00
• 2e2f101e0b Doco: Hidden configs - you won't believe what happens next! Thomas Willingham 2014-10-11 15:15:55 +01:00
• c854f8c238 Revert "x" habeascodice 2014-10-11 05:44:31 -07:00
• 89faf23aac Merge branch 'master' of https://github.com/habeascodice/red habeascodice 2014-10-11 05:41:14 -07:00
• bde8c6d39e Merge remote branch 'upstream/master' habeascodice 2014-10-11 05:34:11 -07:00
• 3d0d36b2bc fix diaspora reshare tags friendica 2014-10-10 19:14:37 -07:00
• f26cd5a636 ah yes, the redundant relay run was for the benefit of wall-to-wall posts issue #633 friendica 2014-10-10 15:17:32 -07:00
• b5f91d7b40 missing source route after edit friendica 2014-10-10 14:45:18 -07:00
• 82d4d156ea Merge https://github.com/friendica/red into pending_merge friendica 2014-10-10 14:12:03 -07:00
• 0991a5a494 remove remnants of old signing structure - now using diaspora_meta friendica 2014-10-10 14:11:13 -07:00
• aae1d11de8 reset route to parent route on Diaspora comments flowing upstream so they won't be rejected going downstream friendica 2014-10-10 14:04:05 -07:00
• 5bfde82258 make sure diaspora comments get the correct route friendica 2014-10-10 13:56:31 -07:00
• f8aabd376b and more missing wrappers marijus 2014-10-10 16:54:12 +02:00
• d5ceb33f6d found more missing wrappers marijus 2014-10-10 16:13:44 +02:00
• 92cc5673cc one more oups... marijus 2014-10-10 16:01:14 +02:00
• 675f5caded oups... that was weired... marijus 2014-10-10 15:57:10 +02:00
• 4e9bd8b8f0 This is a fix to not interfere the ongoing adding of .generic-content-wrapper with the ongoing styling of redbasic theme. adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing. marijus 2014-10-10 15:52:56 +02:00
• 053e606108 Merge branch 'master' of https://github.com/friendica/red Jeroen 2014-10-10 13:37:09 +00:00
• 1dda775969 Good compromise I think. Remove display setting . Set the default (light) schema to = , so that other schemas can still use . Jeroen 2014-10-10 13:35:16 +00:00
• f2335448f4 Merge pull request #632 from zzottel/master zzottel 2014-10-10 14:57:25 +02:00
• 8fe0fbf6fe more updates to German strings plus email templates zottel 2014-10-10 14:54:41 +02:00
• 113eb25cc7 Merge pull request #631 from zzottel/master zzottel 2014-10-10 11:45:51 +02:00
• 2790d9f146 remove unused email template files zottel 2014-10-10 11:42:46 +02:00
• 2b02bf9aa4 Merge pull request #630 from zzottel/master zzottel 2014-10-10 09:42:24 +02:00
• 3a90d037f9 update to German strings zottel 2014-10-10 09:41:14 +02:00
• cde244ef74 improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin. friendica 2014-10-10 00:13:46 -07:00
• 8e7e488ffe doc updates friendica 2014-10-10 00:13:00 -07:00
• 4634049549 allow (our own) ajax urls to pass through bbcode intact. friendica 2014-10-09 20:59:33 -07:00
• 328ed8bb1b Merge remote branch 'upstream/master' habeascodice 2014-10-09 20:47:29 -07:00
• c782272927 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-09 18:39:07 -07:00
• effc8960c3 OK this is important. So read it carefully. friendica 2014-10-09 18:12:53 -07:00
• 9a7d1aa488 add site apps directory to .gitignore friendica 2014-10-09 15:25:08 -07:00
• 1adb7a2eef allow a site to over-ride the system app list without causing git issues friendica 2014-10-09 15:22:21 -07:00
• 77fc267f73 Added the display setting for generic (other) content wrapper. Also did set the default a bit lighter. See if that's ok. Jeroen 2014-10-09 20:55:44 +00:00
• e06c3e5a91 Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it. Jeroen 2014-10-09 14:54:04 +00:00
• 6b48672343 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-09 03:37:53 -07:00
• 6806888fa4 return of the missing diaspora wall-to-wall attribution friendica 2014-10-09 03:36:50 -07:00
• d16d026e56 remove some cruft - revert if you find any regressions marijus 2014-10-09 12:28:54 +02:00
• 156c317a0a fix css for [code] marijus 2014-10-09 12:05:22 +02:00
• f9200027d0 fix userinfo icon size marijus 2014-10-09 11:31:48 +02:00
• a8df8165ea more css fixes marijus 2014-10-09 11:21:13 +02:00
• cd188cb70d css fixes marijus 2014-10-09 10:53:30 +02:00
• 1b0b847fc8 Merge remote branch 'upstream/master' habeascodice 2014-10-09 01:09:41 -07:00
• 7a106cf60c Merge remote branch 'upstream/master' habeascodice 2014-10-09 01:06:59 -07:00
• fc0576acf8 try to track down intermittent wall-to-wall attribution on Diaspora exported posts friendica 2014-10-09 01:02:54 -07:00
• 9ac12d6f32 oembed issues friendica 2014-10-08 20:37:46 -07:00
• 6d0fbba7b4 change parent constructor per discussion friendica 2014-10-08 17:12:10 -07:00
• ddcc0ad567 dav issue friendica 2014-10-08 16:47:30 -07:00
• 15a17280d9 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-08 15:59:04 -07:00
• bca4d540e0 disable email notifications when bulk importing content. friendica 2014-10-08 15:15:20 -07:00
• 5fa1753108 Merge pull request #622 from solstag/master RedMatrix 2014-10-09 08:53:58 +11:00
• 6f2bf5162c Merge pull request #627 from tuscanhobbit/dev RedMatrix 2014-10-09 08:53:47 +11:00
• 202039d389 don't double-encode hashtags friendica 2014-10-08 14:47:24 -07:00
• 9edaa2843b it's probably better to return an int type in json tuscanhobbit 2014-10-08 19:03:07 +02:00
• c7c76cf221 The simplest way to hide hubs in statistics tuscanhobbit 2014-10-08 18:56:42 +02:00
• 29faf955f6 Small fix so search field and search buttons fit well. Jeroen 2014-10-08 13:17:56 +00:00
• 9a1c3f10b2 Merge branch 'master' of https://github.com/friendica/red marijus 2014-10-08 15:09:54 +02:00
• 0dcbebba77 css fix marijus 2014-10-08 15:09:31 +02:00
• 1fc3138c37 soundcloud using a slightly different oembed mechanism - react accordingly friendica 2014-10-08 06:09:15 -07:00
• 98af2de9b4 Merge pull request #626 from habeascodice/master RedMatrix 2014-10-08 23:30:24 +11:00
• 096fbdb31c make nav-pills a bit smaller in height marijus 2014-10-08 13:18:17 +02:00
• 289f57f79e template for searchbox and some more work on saved searches marijus 2014-10-08 12:36:26 +02:00
• 634c2ef8ce nav pills for apps aside marijus 2014-10-08 10:07:19 +02:00
• 38e37d8d68 Merge branch 'master' of https://github.com/friendica/red marijus 2014-10-08 09:49:21 +02:00
• e05c0a8bc4 make author link bold again marijus 2014-10-08 09:24:34 +02:00
• b52d575e95 Merge pull request #625 from letterbomber/master RedMatrix 2014-10-08 18:14:27 +11:00
• 9d5129de34 put back local file check so body is fetched from z_ functions nostupidzone 2014-10-07 23:59:26 -07:00
• e5d346cdc6 css fixes marijus 2014-10-08 08:45:59 +02:00
• ddf4ef7520 Merge remote branch 'upstream/master' habeascodice 2014-10-07 23:33:14 -07:00
• 737a3362d5 Merge remote branch 'upstream/master' habeascodice 2014-10-07 22:35:02 -07:00
• f84453497b x habeascodice 2014-10-07 22:34:30 -07:00
• ee6c53c2e5 add imagick version check when guessing mimetype. It probably isn't important here, but let's make sure we have the right driver installed if we do something else with photos afterward. friendica 2014-10-07 21:16:30 -07:00
• 2975c6dd43 stylish_select wants to attach itself to the root html element. Since it still has some serious issues, don't let it attach itself to anything. friendica 2014-10-07 21:06:23 -07:00
• b595f9d3ee log the recursive reshare from hell at logger_debug until we get through this mess. friendica 2014-10-07 20:42:57 -07:00
• fa75d43b81 add "stacked pills" to saved search term list (the delete icon is still a bit funky) friendica 2014-10-07 20:31:15 -07:00
• af90b8afd6 Merge branch 'master' of https://github.com/habeascodice/red habeascodice 2014-10-07 17:17:15 -07:00
• c01a983957 Merge remote branch 'upstream/master' habeascodice 2014-10-07 16:13:22 -07:00
• d94f6f7c53 Schema option for bgcolour and underline yes/no on hover for the left aside. Jeroen 2014-10-07 22:52:44 +00:00
• 14d538c793 check the imagick version before using it. friendica 2014-10-07 15:14:06 -07:00
• 563163523d Schema option for making links bold again. https://redmatrix.nl/display/d09d1cd2dbc45866beb9c0d384c9dcefe799d1251e3394d12ddb2e34d2c26228@red.mariovavti.com Jeroen 2014-10-07 21:48:42 +00:00
• f08626fd70 Merge pull request #623 from letterbomber/master RedMatrix 2014-10-08 06:28:17 +11:00
• 60a89670f6 add ability to skip broken imagemagick on shared hosting nostupidzone 2014-10-07 09:54:27 -07:00
• 21eae4df9c porting more widgets to bs nav-pills marijus 2014-10-07 18:11:36 +02:00
• f8704f4105 update pt-br translation Alexandre Hannud Abdo 2014-10-07 12:58:01 -03:00
• bf01685463 remove this - some widgets still need to be converted to bs-pills though marijus 2014-10-07 15:03:27 +02:00
• d1dea61b79 take away some boldness, some css fixes and some photo work marijus 2014-10-07 13:09:30 +02:00
• 9df4ceb746 Merge pull request #621 from solstag/master RedMatrix 2014-10-07 17:55:28 +11:00
• 55a937375d datetimepicker data-format now data-date-format Alexandre Hannud Abdo 2014-10-07 02:47:06 -03:00
• c6e86ae0d9 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-06 21:38:15 -07:00
• ac77076135 Make a best guess at how to pull the attribution from the recursive reshare from hell. friendica 2014-10-06 21:37:02 -07:00
• b0e4e01c57 Merge branch 'master' of https://github.com/friendica/red Jeroen 2014-10-07 04:20:44 +00:00
• 90d0fed39d Rainbow_man with alpha channel turns out very ugly in the directory for some hosts. Reset to rainbow_man with alpha, with alpha to rainbow_man_trans. Did the same for red_koala to be sure. You now have a red_koala_trans too. Jeroen 2014-10-07 04:20:24 +00:00
• ae915df0a5 Merge pull request #620 from dawnbreak/RedDAV RedMatrix 2014-10-07 15:17:19 +11:00
• bbf88cf639 found one bug trying to fetch the recursive reshare from hell. I still think there's a problem with attribution but we'll have to wait and find that once we have some content to track. Also in private messages, on the message list page, change the text from delete message to delete conversation, because that's what we're really doing. friendica 2014-10-06 20:54:52 -07:00
• 03585b8f88 SQL error - private message conversation lookup friendica 2014-10-06 19:37:51 -07:00
• 5da8e56f25 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-06 17:47:34 -07:00
• 03bbbdaf10 shareable design elements friendica 2014-10-06 17:47:17 -07:00
• a9c0454b6b Merge pull request #619 from dawnbreak/master Klaus 2014-10-07 01:41:55 +02:00