clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 511b4566b2 Merge pull request #1717 from annando/1506-ostatus-ignore-delete fabrixxm 2015-06-30 08:27:03 +02:00
  • 06d446595e OStatus: By using Qvitter, users can delete items. We can't handle that by now, so we ignore it. Michael Vogel 2015-06-30 08:08:02 +02:00
  • 836432bb9a Removed Google Maps Michael Vogel 2015-06-30 07:42:59 +02:00
  • 36abf624d8 make supported themes compatible with get_theme_uid rabuzarus 2015-06-29 23:03:44 +02:00
  • ab074e200b Mail link in profile page Michael Vogel 2015-06-29 22:54:26 +02:00
  • bffe35ab71 There is now two different checks for the completion of conversations Michael Vogel 2015-06-29 21:53:59 +02:00
  • fcb3cbffe4 OStatus: Use the GUID format for the link to the item Michael Vogel 2015-06-29 21:49:42 +02:00
  • 1cc104af70 update util/messages.po Fabrixxm 2015-06-29 15:59:28 +02:00
  • 03d30983f6 Add new option "-s" to run_xgettext. Fix paths. Fabrixxm 2015-06-29 15:55:27 +02:00
  • 28f0e9a2de Merge pull request #1696 from rabuzarus/acl-var fabrixxm 2015-06-29 13:53:37 +02:00
  • 1a1c2d74f6 Merge pull request #1698 from rabuzarus/identity fabrixxm 2015-06-29 13:52:07 +02:00
  • 17514e0d68 Merge pull request #1703 from rabuzarus/readable_bytes fabrixxm 2015-06-29 13:50:55 +02:00
  • 6c5b4b96a5 Merge pull request #1710 from rabuzarus/deactivate_log fabrixxm 2015-06-29 13:48:42 +02:00
  • eedf829d5c deactivate logger in acl_lookup rabuzarus 2015-06-29 13:46:47 +02:00
  • 68e565889d moved formatBytes() to /include/text.php rabuzarus 2015-06-29 11:22:29 +02:00
  • e46ee26f59 Merge pull request #1704 from annando/1506-vier-notifications fabrixxm 2015-06-29 08:16:35 +02:00
  • b9c42c37d1 Vier: Colors for notifications changed Michael Vogel 2015-06-29 08:00:52 +02:00
  • a982320ba9 show maximagesize warning in a human readable format rabuzarus 2015-06-29 02:39:08 +02:00
  • 4463ae11d8 change profile_url in profile_uid rabuzarus 2015-06-28 13:32:03 +02:00
  • b795bf2935 Merge pull request #1683 from fabrixxm/issue-1655 Michael Vogel 2015-06-27 17:39:00 +02:00
  • 8cca849c2e Merge acl-var into develop rabuzarus 2015-06-27 15:23:19 +02:00
  • 729b7f0e72 restore jotplugins rabuzarus 2015-06-27 15:11:18 +02:00
  • 373bb0822b get the themes settings of foreign profiles rabuzarus 2015-06-27 14:10:43 +02:00
  • d0bf3c06a4 Merge pull request #1694 from annando/1506-ostatus-mention Tobias Diekershoff 2015-06-27 11:12:31 +02:00
  • 787604026f move some identity based functions to identity.php rabuzarus 2015-06-26 18:57:20 +02:00
  • d8c0c62331 work on supported themes to use new acl rabuzarus 2015-06-26 15:44:32 +02:00
  • 5ce125d6e0 cleanup of some unused code rabuzarus 2015-06-26 15:13:52 +02:00
  • e0f6bd6c28 Merge pull request #1695 from strk/accepted Michael Vogel 2015-06-26 13:51:22 +02:00
  • 904b76df85 Spelling error: "acepted" -> "accepted" Sandro Santilli 2015-06-26 12:03:32 +02:00
  • 58b624f877 OStatus: Mentions should work now Michael Vogel 2015-06-26 10:41:11 +02:00
  • 6eebfb2e13 Merge pull request #1692 from fabrixxm/desktopnotifications Michael Vogel 2015-06-26 08:45:16 +02:00
  • 37501a883e make notes work rabuzarus 2015-06-25 22:57:26 +02:00
  • 65286f79ed respect hidewall rabuzarus 2015-06-25 20:29:09 +02:00
  • 94b21245bc some more work to get acl data into populate_acl rabuzarus 2015-06-25 18:57:42 +02:00
  • d2a593b4a0 Merge pull request #1693 from rabuzarus/events-reminder fabrixxm 2015-06-25 15:06:55 +02:00
  • b6b000dd59 delete $md (event-links) because event ID is used rabuzarus 2015-06-25 14:21:12 +02:00
  • bc2117c68a one whitespace rabuzarus 2015-06-25 13:50:48 +02:00
  • d23440af15 use colorbox to display upcomming events rabuzarus 2015-06-25 13:43:41 +02:00
  • bfebf9636b acl for events and photos rabuzarus 2015-06-25 12:38:09 +02:00
  • 12528f033a include jotnets in populate_acl rabuzarus 2015-06-25 12:33:05 +02:00
  • b1ddf28520 Merge pull request #1690 from annando/1506-vier-again fabrixxm 2015-06-25 10:03:19 +02:00
  • 6fc864c947 rework mod/ping and desktop notification logic Fabrixxm 2015-06-25 10:02:26 +02:00
  • 33f0d00ee1 Merge pull request #1691 from annando/1506-ostatus-evenbetter fabrixxm 2015-06-25 08:38:47 +02:00
  • 704110456a Removed test code Michael Vogel 2015-06-25 07:30:14 +02:00
  • 7f052b654f PuSH now supports answers to OStatus messages inside of Friendica threads as well. Michael Vogel 2015-06-25 07:18:02 +02:00
  • 7581bd0f36 Send a salmon notice whenever an OStatus user is mentioned. Michael Vogel 2015-06-25 00:47:59 +02:00
  • 64655ee546 Merge pull request #1687 from annando/1506-location-api Tobias Diekershoff 2015-06-25 00:00:01 +02:00
  • db256217e6 Removed test Michael Vogel 2015-06-24 22:51:46 +02:00
  • 5bf7a3b7a5 Fixed inReplyTo in conversations Michael Vogel 2015-06-24 22:31:38 +02:00
  • 0bac4722cb Vier: Just another thread improvment Michael Vogel 2015-06-24 21:49:51 +02:00
  • c66d095389 Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter Michael Vogel 2015-06-24 21:05:38 +02:00
  • 40bff1a4cf Merge pull request #1686 from annando/1506-vier-threading-2 Tobias Diekershoff 2015-06-24 16:27:53 +02:00
  • e29d05ce4a notifications order, unseen css class Fabrixxm 2015-06-24 16:10:06 +02:00
  • 87ade53162 Some test code added Michael Vogel 2015-06-24 14:21:42 +02:00
  • 3841c41186 Improved width for nested comments. Michael Vogel 2015-06-24 14:20:08 +02:00
  • bd3f29f266 remove close timeout Fabrixxm 2015-06-24 11:15:35 +02:00
  • d8f69737ab remove debug logs Fabrixxm 2015-06-24 11:04:38 +02:00
  • 4549773389 fix desktop notification logic, add onclick handler Fabrixxm 2015-06-24 10:56:10 +02:00
  • cc9da2512b move field help text css to global.css Fabrixxm 2015-06-24 10:11:11 +02:00
  • 4036ad2554 Fix desktop notification Fabrixxm 2015-06-24 09:49:53 +02:00
  • 17e8c29768 fix spelling Fabrixxm 2015-06-24 08:23:56 +02:00
  • 511c2d2c91 rino: settings in admin, choose lowest common on notify Fabrixxm 2015-06-23 17:36:26 +02:00
  • 6fbb02fb93 RINO 2 based on php-encryption Fabrixxm 2015-06-23 16:13:09 +02:00
  • 2112b9cacc Merge pull request #1684 from fabrixxm/install Michael Vogel 2015-06-23 14:19:30 +02:00
  • a3cd16bd9f remove localized htconfig templates Fabrixxm 2015-06-23 12:34:57 +02:00
  • d06beb1431 install: load htconfig template from templates/ Fabrixxm 2015-06-23 12:32:35 +02:00
  • 7d83a19fd4 Disable RINO Fabrixxm 2015-06-23 11:05:03 +02:00
  • 5549dd1dbe Merge pull request #1682 from fabrixxm/issue-1625 Tobias Diekershoff 2015-06-23 11:05:16 +02:00
  • 1e030df286 Merge pull request #1681 from fabrixxm/issue-1629 Tobias Diekershoff 2015-06-23 11:04:26 +02:00
  • 4203132e1a Remove various unused crypto functions Fabrixxm 2015-06-23 10:52:02 +02:00
  • 600c9c8474 remove RINO from htconfig.php Fabrixxm 2015-06-23 10:51:29 +02:00
  • 3168b44317 admin: allow deletion of any users but yourself Fabrixxm 2015-06-23 10:39:28 +02:00
  • 53e6dd6637 Add contact detail to contact drop confirm fix #1629 Fabrixxm 2015-06-23 10:09:27 +02:00
  • 24c91a4fed Merge pull request #1679 from fabrixxm/smallfixestothemes Tobias Diekershoff 2015-06-23 09:12:25 +02:00
  • 2076b95179 Merge pull request #1680 from annando/issue-1642-again fabrixxm 2015-06-23 09:09:29 +02:00
  • 7e4fc930b4 API: Return the geo coordinates Michael Vogel 2015-06-23 07:32:14 +02:00
  • a7cf3639f0 Just some more fixing for issue 1642 Michael Vogel 2015-06-22 23:47:08 +02:00
  • 35e9fc3b02 use fields template in photo edit form fabrixxm 2015-06-22 20:07:19 +02:00
  • a58596e00a Merge pull request #1678 from annando/1506-ostatus-completion Tobias Diekershoff 2015-06-22 07:59:40 +02:00
  • bc82b94564 Merge pull request #1677 from annando/1506-vier-threads Tobias Diekershoff 2015-06-22 07:55:39 +02:00
  • e9542a8d17 OStatus: Support for events and questions Michael Vogel 2015-06-21 22:36:24 +02:00
  • da9bbc92d3 OStatus: Support for bookmarks Michael Vogel 2015-06-21 22:02:44 +02:00
  • bc42b6440a Vier: Improved threading Michael Vogel 2015-06-21 20:40:39 +02:00
  • 50af1fc2c3 Merge pull request #1676 from tobiasd/20150620-markdown fabrixxm 2015-06-21 11:46:13 +02:00
  • 2afc9c31f9 Changed logging behaviour Michael Vogel 2015-06-21 08:32:03 +02:00
  • 5221f38db7 ACL: Don't show OStatus contacts in ACL, since you cannot send private messages to them. Michael Vogel 2015-06-21 01:37:09 +02:00
  • 8229737d2d Small restructuring Michael Vogel 2015-06-21 01:36:23 +02:00
  • df7b907bc4 Display: Look for the network name when fetching the contact (important because of the statusnet connector) Michael Vogel 2015-06-21 01:34:57 +02:00
  • 846edd5bbb Bugfix for repeated items in conversations Michael Vogel 2015-06-20 17:26:47 +02:00
  • 1bbbf2a5f2 Stuff ... Michael Vogel 2015-06-20 14:41:53 +02:00
  • c8430f4c44 Moved all OStatus code in a single file. Michael Vogel 2015-06-20 14:40:30 +02:00
  • 7c48ed60eb hide some HTML coded chars from markdownification Tobias Diekershoff 2015-06-20 14:27:42 +02:00
  • 8fa2030023 <3 causes troubles in D* Tobias Diekershoff 2015-06-20 12:31:34 +02:00
  • 168906f9c9 Code cleanup Michael Vogel 2015-06-20 09:15:19 +02:00
  • 6fbb03801c The OStatus completion is now called before the original item is stored. Michael Vogel 2015-06-20 08:44:29 +02:00
  • 650e6bc575 Merge pull request #1674 from fraengii/patch-2 Tobias Diekershoff 2015-06-17 10:52:11 +02:00
  • 3c135c4d78 Update Quick-Start-groupsandpages.md Frank Dieckmann 2015-06-17 10:48:23 +02:00
  • f1dbbfd291 Merge pull request #1673 from fraengii/patch-1 Tobias Diekershoff 2015-06-17 10:39:41 +02:00
  • 85bf6e8fb4 Update Connectors.md Frank Dieckmann 2015-06-17 10:32:50 +02:00
  • 1cd5a3184d Merge pull request #1672 from tobiasd/20150614-frank fabrixxm 2015-06-15 14:00:18 +02:00