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

• 4f35efa0ba Revert "Language names via intl library." RedMatrix 2014-12-31 10:43:19 +11:00
• abd345f80f Merge branch 'master' into trinidad friendica 2014-12-30 15:25:06 -08:00
• ae9d08267c Merge pull request #797 from anaqreon/imagelink RedMatrix 2014-12-31 10:23:50 +11:00
• 009b05b3b6 Merge pull request #796 from pafcu/profeditfix RedMatrix 2014-12-31 10:22:30 +11:00
• b7d758fed0 Merge pull request #795 from pafcu/tplcleanup RedMatrix 2014-12-31 10:22:12 +11:00
• 7b0b0dd76f Merge pull request #794 from pafcu/lang RedMatrix 2014-12-31 10:21:53 +11:00
• 4a82967639 Merge pull request #791 from pafcu/notifications RedMatrix 2014-12-31 10:21:38 +11:00
• c49b521884 Added url tag around image for inserted links Andrew Manning 2014-12-30 16:16:57 -06:00
• b78a545a10 Merge pull request #1 from friendica/master anaqreon 2014-12-30 16:06:35 -06:00
• 43671a0a32 Merge pull request #792 from pafcu/cssrefactor pafcu 2014-12-30 22:42:34 +02:00
• 0623b47237 Merge pull request #793 from pafcu/filestorageurlfix pafcu 2014-12-30 22:40:53 +02:00
• 3096ae43c3 Merge pull request #790 from pafcu/sortnotifications pafcu 2014-12-30 22:39:31 +02:00
• 2444a3f9d9 Don't show links to edit alternate profiles if multi_profiles is disabled Stefan Parviainen 2014-12-30 21:33:20 +01:00
• 4edc9a696b design fixes for photos, files and random fixes marijus 2014-12-30 21:04:48 +01:00
• b54bbf0fb8 Update function doc, return language code if language is not recognized Stefan Parviainen 2014-12-30 20:34:26 +01:00
• 9cab8ae58a Language names via intl library. Fixes #773 Stefan Parviainen 2014-12-30 19:57:12 +01:00
• f6b16e1d5a Encode URL offered in filestorage. Fixes #780 Stefan Parviainen 2014-12-30 18:11:45 +01:00
• e6a3ea2c95 Make showing wall posts, intros and private messages under Notices optional Stefan Parviainen 2014-12-30 15:27:33 +01:00
• 2710510392 Sort notifications Stefan Parviainen 2014-12-30 15:21:29 +01:00
• 12e6d98659 Remove some old, unused templates Stefan Parviainen 2014-12-30 14:11:27 +01:00
• 8e034a3b6b fix recursive file permissions marijus 2014-12-30 13:56:27 +01:00
• 6cbbe854d5 css fixes marijus 2014-12-30 12:12:55 +01:00
• 6501c4d93e Make redbasic css more modular Stefan Parviainen 2014-12-30 11:32:00 +01:00
• 2f650b74d3 Merge branch 'master' into trinidad friendica 2014-12-29 23:58:14 -08:00
• 9b2c71a5dc Merge https://github.com/friendica/red into pending_merge friendica 2014-12-29 23:57:33 -08:00
• 5cfe051139 initial trinidad checkin friendica 2014-12-29 23:48:04 -08:00
• 20356217c5 revup friendica 2014-12-29 23:41:37 -08:00
• 619733e297 Merge pull request #789 from pafcu/chanman RedMatrix 2014-12-30 08:57:37 +11:00
• d1d4cec932 Merge pull request #787 from pafcu/mainjsfix RedMatrix 2014-12-30 08:57:08 +11:00
• ca8b31b989 Merge pull request #786 from f03el/master RedMatrix 2014-12-30 08:56:50 +11:00
• f2bfdf0c76 some work on cloud actionspanel and minor cleanup marijus 2014-12-29 22:45:07 +01:00
• e69e59d260 Don't show current channel separately in channel manager, highlight it instead Stefan Parviainen 2014-12-29 22:07:40 +01:00
• d801c361d6 css fixes and remove sloppy photos setting since it is not supported anymore in redbasic marijus 2014-12-29 21:53:00 +01:00
• de338b3dd7 Show some notification badges in red to indicate they are about you Stefan Parviainen 2014-12-29 20:43:24 +01:00
• 345943d48f Only call autotime() on the correct elements Stefan Parviainen 2014-12-29 20:02:56 +01:00
• d029d3a9f9 Don't trim escaped quotes Erik Lundin 2014-12-29 17:24:53 +01:00
• a70e42edac Remove link to hubloc status in admin panel. This is a potentially useful tool, but plain doesn't work at the moment. Thomas Willingham 2014-12-29 14:47:41 +00:00
• ca182d7024 Merge pull request #784 from tuscanhobbit/dev Paolo T 2014-12-29 09:11:25 +01:00
• bcbfc83376 Italian localization Paolo Tacconi 2014-12-29 09:09:51 +01:00
• 3065650683 filter posts you author from unseen notifications - note there are other ways to do this, but involve some code complexity. This is easier to implement but may have a slight impact on the ping query performance. It's not horrid, just mentioning for the record. friendica 2014-12-28 23:21:49 -08:00
• b7d2b9c1ef Merge pull request #778 from pafcu/loginredir RedMatrix 2014-12-29 09:29:23 +11:00
• 7b98a6fcb0 Merge pull request #772 from pafcu/chanman RedMatrix 2014-12-29 09:29:12 +11:00
• 6cdd5d1c48 Merge pull request #770 from pafcu/apps RedMatrix 2014-12-29 09:29:00 +11:00
• 8d144396b1 Merge pull request #769 from pafcu/profiles RedMatrix 2014-12-29 09:28:47 +11:00
• fa23439b9c more files css fixes marijus 2014-12-28 20:46:16 +01:00
• 1ab23061df files css fixes marijus 2014-12-28 20:34:12 +01:00
• 801ab709ad more work on files marijus 2014-12-28 18:16:27 +01:00
• 0e0a4e4999 Merge pull request #781 from pafcu/docfix pafcu 2014-12-28 12:44:49 +02:00
• 69aeb5d205 Document photo_cache_time setting Stefan Parviainen 2014-12-28 11:43:54 +01:00
• 0b79445b57 Merge pull request #779 from pafcu/audio pafcu 2014-12-28 12:30:20 +02:00
• fffc7dffba Fix typo Stefan Parviainen 2014-12-28 11:28:54 +01:00
• f08ee3bab9 Make spaces work in [audio] and [video]. Fixes #774 Stefan Parviainen 2014-12-28 11:22:58 +01:00
• 426ac22e12 Redirect to login page on failed login. Fixes #628 Stefan Parviainen 2014-12-28 09:26:30 +01:00
• 50943f439c issue #777, make photo cache time configurable, read the comments. friendica 2014-12-27 18:19:51 -08:00
• 096956ff78 revup friendica 2014-12-27 14:04:13 -08:00
• 4a0150026b merge Christian Vogeley 2014-12-27 22:37:10 +01:00
• cafc1b64b0 some more mime-type -> icon for filebrowser marijus 2014-12-27 14:28:02 +01:00
• 40a327b68f Allow quick access to mail and connections from Channel Manager Stefan Parviainen 2014-12-27 14:06:09 +01:00
• 6a679d26ce Fix #771, add tooltips to mail and intros count in channel manager, always show counts (even when 0, makes it easier to understand what the icons are) Stefan Parviainen 2014-12-27 13:36:05 +01:00
• 754fec9a54 Redirect /profiles to default profile when multi_profiles is off. Fixes #768 Stefan Parviainen 2014-12-27 12:46:59 +01:00
• cdab20f1fe New icons for profile, random profile and profile photo Stefan Parviainen 2014-12-27 12:07:20 +01:00
• 2a49c3ff72 Show bug reporting app to visitors Stefan Parviainen 2014-12-27 11:20:41 +01:00
• a8d5cf56e3 New icon for language selection Stefan Parviainen 2014-12-27 11:16:11 +01:00
• 0cb0c2b1bf more work on files marijus 2014-12-27 10:10:56 +01:00
• 82d3c2a7e0 Merge https://github.com/friendica/red into pending_merge friendica 2014-12-26 15:45:50 -08:00
• e08226f432 Merge pull request #767 from pafcu/apps RedMatrix 2014-12-27 10:44:00 +11:00
• 5395bb5dee Make poke icon hand non-transparent Stefan Parviainen 2014-12-26 23:38:40 +01:00
• bb2c68cba3 Use Tango-based app icons Stefan Parviainen 2014-12-26 23:24:50 +01:00
• bfc0b00d93 Merge pull request #766 from pafcu/autocomplete RedMatrix 2014-12-27 09:24:47 +11:00
• 0130fb077f Cruft left over from stuff we don't have anymore. Thomas Willingham 2014-12-26 16:59:52 +00:00
• 7ba92feabf doc update friendica 2014-12-26 00:13:22 -08:00
• ca0c310b65 change PERMS_CONTACTS to PERMS_SPECIFIC in permission roles so that individual connections can be revoked instead of this being inherited and un-changeable friendica 2014-12-26 00:09:34 -08:00
• a02d155f79 Fix regex in contact autocomplete Stefan Parviainen 2014-12-24 08:30:35 +01:00
• d1273b17e5 document the new inline map codes friendica 2014-12-23 14:47:34 -08:00
• b171ea23e4 cleanup bb2diaspora - was getting crufty friendica 2014-12-23 14:18:27 -08:00
• 8db34ac826 diaspora formatting improvements (getting too many xx-large posts) friendica 2014-12-22 20:54:22 -08:00
• ee89ff5124 some improvements in api direct messages friendica 2014-12-22 18:26:11 -08:00
• f66df5e137 direct messages in api have some issues, not properly ported from friendica originally. Here's a start. I think at best they may return encrypted gibberish currently, but let's work through them one at a time. friendica 2014-12-22 18:05:34 -08:00
• 63ae4b5150 Merge https://github.com/friendica/red into pending_merge friendica 2014-12-22 16:33:41 -08:00
• 1049adeff6 Merge pull request #760 from pafcu/apps RedMatrix 2014-12-23 11:33:11 +11:00
• 9544dffaf3 add example to script friendica 2014-12-22 16:32:11 -08:00
• c85702aeb6 basic ical parser friendica 2014-12-22 16:28:30 -08:00
• 046299139a Merge https://github.com/friendica/red into pending_merge friendica 2014-12-22 14:32:06 -08:00
• b8d16bc9db revup friendica 2014-12-22 14:31:50 -08:00
• fa65d31f3f Move app icon centering to style.css Stefan Parviainen 2014-12-22 23:06:04 +01:00
• 83eb7a10e2 Option to check that a random profile works before returning it Stefan Parviainen 2014-12-22 22:57:58 +01:00
• 8cf57f95a5 Merge pull request #759 from pafcu/apps RedMatrix 2014-12-23 08:48:22 +11:00
• 3f6e9a37db Merge pull request #758 from pafcu/autocomplete RedMatrix 2014-12-23 08:48:11 +11:00
• c819c276f0 Remove unused apps.tpl Stefan Parviainen 2014-12-22 19:05:16 +01:00
• 37534d110c Center app names Stefan Parviainen 2014-12-22 18:53:13 +01:00
• 36f30d1ca1 Rename some apps, fix webpages requires Stefan Parviainen 2014-12-22 18:52:04 +01:00
• bd2be2b10c Fix feature check in apps (missing parenthesis), allow multiple requires (comma separated) Stefan Parviainen 2014-12-22 17:45:43 +01:00
• 5fd26eceb4 Pass sitename to apps Thomas Willingham 2014-12-22 15:39:04 +00:00
• b6bbb8e4ad Show autocomplete taggable with special color Stefan Parviainen 2014-12-22 16:35:21 +01:00
• d3830aea96 provide last successful poll run time (using relative time) in siteinfo so that we can tell folks that have no idea what we're talking about that their poller definitely isn't running and this is probably why nothing works correctly. friendica 2014-12-21 18:40:25 -08:00
• b840c27995 Merge https://github.com/friendica/red into pending_merge friendica 2014-12-21 14:45:46 -08:00
• c732b72a0d Merge pull request #757 from git-marijus/master RedMatrix 2014-12-22 09:45:33 +11:00
• ca56123a16 Merge pull request #756 from encyclomundi/master RedMatrix 2014-12-22 09:45:18 +11:00
• e789cbf2e7 Merge pull request #755 from pafcu/docfix RedMatrix 2014-12-22 09:45:06 +11:00
• d00d60d08d Merge pull request #754 from pafcu/categoryinput RedMatrix 2014-12-22 09:44:23 +11:00