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

• fa019791fa some background work for import/export of things and liked things/profiles friendica 2014-09-27 00:14:35 -07:00
• 2681071970 Some documentation of include/config.php. Klaus Weidenbach 2014-09-26 22:28:35 +02:00
• 04e460c8f8 upload first but not inside another {{if}} marijus 2014-09-26 19:34:39 +02:00
• a7269e9d6e upload should be first marijus 2014-09-26 19:28:28 +02:00
• f652fbdf74 fix blockquote marijus 2014-09-26 19:17:02 +02:00
• 94fcf5885e So much so, in fact, that I didn't even notice the typo. Thomas Willingham 2014-09-26 17:16:55 +01:00
• c9e8a3e8fe Minor doco. Add some clarity - that had me scratching my head. Thomas Willingham 2014-09-26 17:05:22 +01:00
• eaf96f987a Rebase from upstream Paolo Tacconi 2014-09-26 14:40:22 +02:00
• 574c4845b7 move some css to the right place marijus 2014-09-26 12:34:22 +02:00
• b948ab5955 some more work on photos - work in progress marijus 2014-09-26 12:29:07 +02:00
• 1e7fbac6c1 doc updates, clean up buttons on PM edit template to match other edit buttons friendica 2014-09-26 01:52:30 -07:00
• d8c03526ed optionally include wall items (posts) in import/export friendica 2014-09-25 20:21:23 -07:00
• e75f1ccb2e Typo Thomas Willingham 2014-09-25 19:47:06 +01:00
• 6324a07dd8 Rebase from upstream Paolo Tacconi 2014-09-25 08:44:07 +02:00
• 92c723d37c constrain viewsrc colorbox to 80% of the current page size. It gets messy scrolling to the right for days to find the close button. friendica 2014-09-24 17:32:38 -07:00
• 24d402941f if no rss/atom element author, use feed level contact friendica 2014-09-24 14:27:18 -07:00
• c76b8febaa make it the default friendica 2014-09-24 02:18:13 -07:00
• 95470a9f9b one step closer friendica 2014-09-24 02:08:35 -07:00
• be54f0d9e6 more testing friendica 2014-09-24 01:58:24 -07:00
• 87b8e2725c just an experiment - don't do anything with this until I'm finished with it. friendica 2014-09-24 01:45:57 -07:00
• f6269e2082 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-23 20:56:33 -07:00
• 81ee35e03b fix url mismatches of a single trailing slash for feed author/owner comparisons; update diaspora_compat friendica 2014-09-23 20:55:22 -07:00
• 0c929c2ec5 Merge pull request #601 from solstag/master RedMatrix 2014-09-24 13:38:07 +10:00
• 02210b81d8 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-23 20:38:25 -07:00
• f203d2a3b0 diaspora private mail seems to work now - but there's an obfuscation leak via the conversation structure that needs to be dealt with. friendica 2014-09-23 20:36:10 -07:00
• 7076eafc14 Merge pull request #602 from zzottel/master zzottel 2014-09-23 16:37:24 +02:00
• ccc97ffdc0 update German main help page zottel 2014-09-23 16:35:30 +02:00
• 2b466ccb8c d* little fixes friendica 2014-09-23 04:40:36 -07:00
• ad86cc24c8 d* PM cont. friendica 2014-09-23 04:34:35 -07:00
• 509a85cb12 more work on d* private messages friendica 2014-09-23 03:03:14 -07:00
• 72ec78d027 trying to call mod/magic on rss resources - which have no hub friendica 2014-09-22 23:49:12 -07:00
• e8854bb19d better way to deal with effective_uid friendica 2014-09-22 22:03:19 -07:00
• fb05919d90 make discover items interactive friendica 2014-09-22 21:37:19 -07:00
• b735961560 found the sucker friendica 2014-09-22 16:23:59 -07:00
• 6e141a8a53 Merge from origin tuscanhobbit 2014-09-22 23:09:44 +02:00
• 6a9e8fcd20 Merge from upstream tuscanhobbit 2014-09-22 22:44:10 +02:00
• aa59010885 update pt-br translation Alexandre Hannud Abdo 2014-09-22 15:42:59 -03:00
• 2070dbfdea private mail from d* to r# seems to work with these edits. - Now have to go back the other way. friendica 2014-09-22 02:27:52 -07:00
• 4aa1506c00 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-21 15:13:32 -07:00
• e76ab30467 we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = HUBLOC_OFFLINE instead. Filter this as well from deliveries. friendica 2014-09-21 15:11:47 -07:00
• aa928d65eb Merge pull request #600 from dawnbreak/master RedMatrix 2014-09-22 07:50:20 +10:00
• 09b5bbb032 feeds with '@' in the URL were being handled as webfinger addresses and didn't fall through to RSS discovery. Issue #599 friendica 2014-09-21 14:46:12 -07:00
• d2268a412d Don't link unknown likes. Klaus Weidenbach 2014-09-21 17:51:01 +02:00
• 22e6e691ca Navbar notifications: don't show "nothing new here" unless we've checked and there's nothing. Until we know for sure, display "Loading...". friendica 2014-09-20 16:34:48 -07:00
• 44cb423f21 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-20 16:22:21 -07:00
• 8d23a8da8d fix empty likes friendica 2014-09-20 16:21:49 -07:00
• a1773fea25 Merge pull request #598 from cvogeley/master cvogeley 2014-09-20 22:41:47 +01:00
• 89fec0e085 Allow ordering by created Christian Vogeley 2014-09-20 23:28:42 +02:00
• 69a10e8ca7 oups... marijus 2014-09-20 17:30:11 +02:00
• 6c806f6f48 aalso change the way we check for number of chatrooms marijus 2014-09-20 17:28:42 +02:00
• bd54358aa6 show bookmarks menu only if we have any bookmarks already marijus 2014-09-20 16:31:56 +02:00
• 9feb619bea update jg to latest preview release and try once more to really justify the whole gallery marijus 2014-09-20 15:40:40 +02:00
• 1c56442818 Repeat after me - we always refer to our clientelle as 'members'. If your software calls you a "user" - get rid of it. friendica 2014-09-19 23:35:16 -07:00
• 302483790c Merge https://github.com/friendica/red into pending_merge friendica 2014-09-19 16:51:05 -07:00
• cb434818f8 closing tag friendica 2014-09-19 16:50:43 -07:00
• 6923557ecb Bit tweaking Jeroen 2014-09-19 21:23:41 +00:00
• 017726f069 Another piece that didn't fit well in the dark schema. Hopefully this is the last. Jeroen 2014-09-19 21:16:55 +00:00
• de45f42f9f update nl.2 Jeroen 2014-09-19 20:43:43 +00:00
• eedc0e50c1 update nl Jeroen 2014-09-19 15:54:19 +00:00
• 87a6f25769 try to sort out walltowall translation for diaspora recipients friendica 2014-09-19 02:22:24 -07:00
• 083b5da967 doc updates friendica 2014-09-19 02:22:12 -07:00
• 45df73d456 add stylish_select to new_channel page - but comment out until we can theme it. It needs a bit of theming to even work correctly. friendica 2014-09-18 17:06:15 -07:00
• 3191432c40 add stylish_select library to provide a way to clean up and theme all the ugly select boxes friendica 2014-09-18 16:46:17 -07:00
• c824e426e2 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-18 16:33:31 -07:00
• d4759a5883 repeated content collapse on update from display page under rare conditions (when the conversation hasn't changed) friendica 2014-09-18 16:32:05 -07:00
• caabc69e08 Merge pull request #596 from beardy-unixer/master RedMatrix 2014-09-19 06:25:58 +10:00
• 5c8f5e2aa3 Catch the settings too Thomas Willingham 2014-09-18 18:14:52 +01:00
• fc93ee89a9 If a short ping causes lots of issues, and anyone who has been here a while tends to have a longer ping, we should probably have a longer ping Thomas Willingham 2014-09-18 18:09:54 +01:00
• bdfe2c7786 Merge remote-tracking branch 'upstream/master' Thomas Willingham 2014-09-18 18:07:38 +01:00
• 595be9919b Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-09-18 17:08:23 +01:00
• 65441b95bb Doco - permissions needs some work, but this is a relative whopper. Thomas Willingham 2014-09-18 17:07:47 +01:00
• 7da97c1981 Merge pull request #3 from friendica/master Paolo T 2014-09-18 08:41:41 +02:00
• 0b47fb9a91 keep the language consistent friendica 2014-09-17 22:59:56 -07:00
• 0deb592cb5 typo friendica 2014-09-17 22:55:27 -07:00
• 8eb21cceb3 use 24-hour clock for non-American dates friendica 2014-09-17 22:53:38 -07:00
• 7167208345 forgot this one... friendica 2014-09-17 22:30:25 -07:00
• c6062d7872 usability tweaks friendica 2014-09-17 21:52:30 -07:00
• 22aa5aca14 add a spinner or two to the new channel page so folks have a clue that we're doing something in the background - trying to complete the nick field for them (and then check it before they submit). friendica 2014-09-17 21:27:02 -07:00
• 51d9f0d97a channel permission roles friendica 2014-09-17 21:16:15 -07:00
• eca420ec96 defined several permission roles - these will probably require some review and adjustment. friendica 2014-09-17 19:46:55 -07:00
• 02fa970569 make the output a bit more readable friendica 2014-09-17 19:14:23 -07:00
• 618b93d42e let the xchan diagnostic accept a webbie friendica 2014-09-17 19:08:15 -07:00
• 4014093572 implement permission roles - the backend should be done except for maybe a couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. friendica 2014-09-17 17:59:46 -07:00
• cd79044778 no sense maintaining 2 to-do files. I think the one I'm removing is referenced online somewhere - which is why it wasn't done earlier. Can't find it, so just note that somebody will complain and we'll have to edit the pointer someday. friendica 2014-09-16 23:12:50 -07:00
• fd37d9c92a Merge pull request #595 from solstag/master RedMatrix 2014-09-17 16:07:00 +10:00
• 0090cbf84b that's why bb2diaspora_itemwallwall() wasn't doing its thang. friendica 2014-09-16 22:26:52 -07:00
• 19e8d10b7a still some old Friendica database queries in diaspora_signed_retraction friendica 2014-09-16 21:08:34 -07:00
• 53d0e855df z_post_url_json() added to easily deal with JSON post APIs; without getting content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers. friendica 2014-09-16 20:46:44 -07:00
• ce36e8a8bb Merge https://github.com/friendica/red into pending_merge friendica 2014-09-16 19:09:30 -07:00
• c4608d4c82 just mark dead hubloc deleted - don't remove them. This could cause problems. Also clean up fetch_url/post_url header option friendica 2014-09-16 19:07:19 -07:00
• 5bdfc2f647 Fix name attribute of button elements so jquery '.submit()' doesn't break Alexandre Hannud Abdo 2014-09-16 18:56:34 -03:00
• eed6cbfb2a Merge branch 'master' of https://github.com/friendica/red marijus 2014-09-16 14:24:25 +02:00
• b5bb2230eb this still has less issues marijus 2014-09-16 14:18:03 +02:00
• 6a82ccecd0 when importing channels - use the new location notification message to tell your original site where it sits in terms of primary. friendica 2014-09-16 05:14:06 -07:00
• a1b66f56f0 use the more portable encoded_item format for exported items - but with added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this. friendica 2014-09-16 03:33:48 -07:00
• b2f2424b52 push individual block to directory friendica 2014-09-15 23:11:08 -07:00
• 4d91b6e6d2 fat finger - must have been here a while friendica 2014-09-15 22:53:33 -07:00
• 6c0133be1f change platform name to redmatrix (lowercase, one word) for use in meta tags and stuff, move yet another oauth1 library to library instead of having it in plugins where we'll end up with a white screen if we re-use it in another plugin; which I plan to do. friendica 2014-09-15 22:23:07 -07:00
• 5f9c326ad7 channel export with items friendica 2014-09-15 21:31:32 -07:00
• 171719a774 additions and edits to the faq friendica 2014-09-15 17:59:47 -07:00