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

Commit Graph

  • ab0fbc3a65 Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers Michael Vogel 2015-10-10 04:56:40 +02:00
  • 1c21401751 acl lookup now works fine as well. Michael Vogel 2015-10-09 23:27:00 +02:00
  • 0eae67ea48 update attendance state on profile wall rabuzarus 2015-10-09 14:20:01 +02:00
  • d85d215bb8 attendance update in network stream rabuzarus 2015-10-09 13:46:08 +02:00
  • 16da708e07 Contact names with ">" and "<" are a problem ... Michael Vogel 2015-10-09 07:39:38 +02:00
  • ba1207e6e1 translate attendance with localize_item() rabuzarus 2015-10-08 22:23:09 +02:00
  • 6a9ec14878 small bugfix in like.php rabuzarus 2015-10-08 20:26:11 +02:00
  • d2d084b814 treat attendance as like activity rabuzarus 2015-10-08 18:35:33 +02:00
  • 26983bafff Merge pull request #1944 from annando/1510-proxy-picture-size Tobias Diekershoff 2015-10-08 08:03:42 +02:00
  • 61c3ce7a21 Bugfix: The contact names had to be escaped Michael Vogel 2015-10-08 00:25:55 +02:00
  • d808888429 added some lines to the htconfig config variables Tobias Diekershoff 2015-10-07 09:38:47 +02:00
  • a76aca2c90 Merge pull request #1942 from tobiasd/20151007-IT fabrixxm 2015-10-07 08:37:50 +02:00
  • 1f0b759e2f Added resize possibility to proxy function Michael Vogel 2015-10-07 08:25:10 +02:00
  • dd9f475ff6 personalise emails send from the server Tobias Diekershoff 2015-10-07 06:22:15 +02:00
  • b4ec07ab27 IT: update to the strings Tobias Diekershoff 2015-10-07 06:20:54 +02:00
  • d7d1a09558 Merge pull request #1941 from annando/1510-diaspora-privacy Tobias Diekershoff 2015-10-06 19:02:41 +02:00
  • 14e17b944f Reworked fetching of contact data on "display" page Michael Vogel 2015-10-06 18:31:08 +02:00
  • eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy Michael Vogel 2015-10-06 07:41:09 +02:00
  • 901b95e935 Hide some profile data if not connected. Michael Vogel 2015-10-06 06:56:31 +02:00
  • b60cf21f8a Merge pull request #1940 from annando/1510-proxy-problems Tobias Diekershoff 2015-10-06 06:43:20 +02:00
  • 7ed61b2edc Removed "proxy_parse_html" since it is now done in the bbcode function. Michael Vogel 2015-10-05 22:25:14 +02:00
  • 2676a0f0e5 The proxy function sometimes kills embedded pictures ... Michael Vogel 2015-10-05 22:19:34 +02:00
  • e1aa649703 Merge pull request #1939 from annando/issue-1938 Tobias Diekershoff 2015-10-05 19:14:42 +02:00
  • 607817d1b3 Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated. Michael Vogel 2015-10-05 17:38:57 +02:00
  • 5545008768 Merge pull request #1937 from annando/1510-follow-notifications Tobias Diekershoff 2015-10-05 15:15:52 +02:00
  • d3ac3f8490 Added the contact menu to the search as well. Michael Vogel 2015-10-05 08:08:59 +02:00
  • 133d38be20 Rearranged the contact menu so that it fits the menu at the conversations. Michael Vogel 2015-10-05 00:19:58 +02:00
  • caa9073a8f Remove all menu entries on the contact list that are empty Michael Vogel 2015-10-05 00:14:39 +02:00
  • a663e4693f Further improvement of the contact menu Michael Vogel 2015-10-04 23:41:13 +02:00
  • 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures Michael Vogel 2015-10-04 22:24:58 +02:00
  • 79391bbb62 Merge pull request #1936 from annando/1510-contact-menu Tobias Diekershoff 2015-10-04 21:30:35 +02:00
  • b037f977fa The contact menu is now improved (for example a "Follow" link) Michael Vogel 2015-10-04 21:17:28 +02:00
  • e10dc09bbc Merge pull request #1935 from annando/1510-bugfix-repair Tobias Diekershoff 2015-10-04 20:10:38 +02:00
  • 05ae3d528e A contact that couldn't be resolved is know known as "UNKNOWN" Michael Vogel 2015-10-04 19:48:29 +02:00
  • 72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... Michael Vogel 2015-10-04 19:39:55 +02:00
  • 9f68676db6 Merge pull request #1934 from annando/1510-better-notification Tobias Diekershoff 2015-10-04 17:49:02 +02:00
  • d96a55e803 Merge pull request #1931 from annando/1510-documentation-htconfig Tobias Diekershoff 2015-10-04 17:46:50 +02:00
  • c49a1b1f8d Added explanation how to add a parameter to the .htconfig.pgp Michael Vogel 2015-10-04 17:37:08 +02:00
  • 8c514307cf For safety reasons include the include Michael Vogel 2015-10-04 17:20:47 +02:00
  • 4003b9cc5d Let the notification look more like the follow dialog Michael Vogel 2015-10-04 17:18:58 +02:00
  • e1f3f2bc6c Merge pull request #1933 from annando/1510-follow-more-data Tobias Diekershoff 2015-10-04 17:02:27 +02:00
  • 18e8d0de59 Merge pull request #1932 from annando/1510-vier-2 Tobias Diekershoff 2015-10-04 17:01:25 +02:00
  • 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. Michael Vogel 2015-10-04 15:55:24 +02:00
  • ba41336099 Preparation for a not found contact. Michael Vogel 2015-10-04 14:49:12 +02:00
  • d0ae5ce326 Show more information when following a new contact Michael Vogel 2015-10-04 14:41:39 +02:00
  • 1d71dde7ef Beautyfied code. Link to "follow" on community profiles Michael Vogel 2015-10-04 14:40:02 +02:00
  • 3b18c6cb0c Small optical changes in "vier" Michael Vogel 2015-10-04 12:24:00 +02:00
  • fd80e75693 Documentation of .htconfig.php values Michael Vogel 2015-10-04 12:02:44 +02:00
  • c14309094e Merge pull request #1930 from tobiasd/20151004-de Michael Vogel 2015-10-04 10:25:40 +02:00
  • 01d38a353c DE update to the translation Tobias Diekershoff 2015-10-04 09:23:58 +02:00
  • be70dde61f Merge pull request #1928 from annando/issue-1913 Tobias Diekershoff 2015-10-04 08:54:59 +02:00
  • 5d6f02da41 Merge pull request #1927 from annando/issue-1914 Tobias Diekershoff 2015-10-04 08:54:01 +02:00
  • 05b2836d66 Merge pull request #1926 from annando/1510-permit-crawler Tobias Diekershoff 2015-10-04 08:53:32 +02:00
  • a3221945d0 Merge pull request #1923 from annando/1510-feed-remote-self Tobias Diekershoff 2015-10-04 08:51:58 +02:00
  • b5dccb0a95 Merge pull request #1922 from annando/1510-vier-right-aside Tobias Diekershoff 2015-10-04 08:51:36 +02:00
  • f93a2242e0 missed one to delete rabuzarus 2015-10-04 01:00:24 +02:00
  • c0e277cec8 Issue 1913: Report invalid feed Michael Vogel 2015-10-04 00:28:15 +02:00
  • 4e1bffd0a9 Issue 1914: A feed was falsely detected as OStatus Michael Vogel 2015-10-03 23:57:00 +02:00
  • 42ad8c2b25 New template for http status messages Michael Vogel 2015-10-03 23:19:09 +02:00
  • 2840bf2293 New option to permit crawlers Michael Vogel 2015-10-03 23:16:40 +02:00
  • 525442e4fd Merge pull request #1916 from rabuzarus/geotag Michael Vogel 2015-10-03 22:06:28 +02:00
  • 5576c004ad Merge origin/geotag into geotag rabuzarus 2015-10-03 20:41:26 +02:00
  • c775d6885b port of reds geotag feature rabuzarus 2015-09-30 00:19:54 +02:00
  • f92a253946 Bugfix: Remote self worked anymore Michael Vogel 2015-10-03 13:58:10 +02:00
  • 3ae0deadb6 The right side now contains much stuff from diabook - but completely reworked. Michael Vogel 2015-10-03 12:55:55 +02:00
  • 47c855388e Vier: Menu at the right side (inspired and copyied from diabook) Michael Vogel 2015-10-01 08:19:35 +02:00
  • a102fd83e8 Merge pull request #1919 from tobiasd/20151001-calendar Michael Vogel 2015-10-01 08:09:28 +02:00
  • d6beb7db1f add a header to seperate the beginning of week settings Tobias Diekershoff 2015-10-01 06:19:57 +02:00
  • f8eca3da91 Merge pull request #1918 from annando/1510-events Tobias Diekershoff 2015-10-01 06:09:37 +02:00
  • 5fe357ee75 Rearrange the navigation bar on smaller windows Michael Vogel 2015-09-30 21:59:55 +02:00
  • 389b7de451 Setting for the first day of the week Michael Vogel 2015-09-30 19:18:13 +02:00
  • 68a6f0298e The events moved from the profile to the navigation bar - for supported themes Michael Vogel 2015-09-30 18:50:44 +02:00
  • 7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. rabuzarus 2015-09-30 16:58:02 +02:00
  • a13280ac4a revert little rebase mistake rabuzarus 2015-09-30 15:30:13 +02:00
  • 2ff67ef5ed fixes like/dislike for photos rabuzarus 2015-06-04 04:19:06 +02:00
  • f5c7006f30 rest of the consensus porting work and integration into friendica Credits to Mike Macgirvin for the code rabuzarus 2015-06-03 20:57:30 +02:00
  • 0077494396 make event confirmation work rabuzarus 2015-06-01 13:57:45 +02:00
  • 37fccee503 first work for consensus rabuzarus 2015-06-01 01:23:04 +02:00
  • b6781f5e40 Merge geotag into develop rabuzarus 2015-09-30 12:37:20 +02:00
  • 8e1564965d port of reds geotag feature rabuzarus 2015-09-30 12:33:57 +02:00
  • aa9ceabdd9 Merge remote-tracking branch 'upstream/master' Michael Vogel 2015-09-30 10:03:52 +02:00
  • 2e8caf7f27 Merge pull request #1915 from rabuzarus/hide_profilepics fabrixxm 2015-09-30 08:57:31 +02:00
  • 67638118e7 Merge pull request #1912 from annando/1509-worker fabrixxm 2015-09-30 08:56:54 +02:00
  • 2e9e17baad Merge pull request #1911 from annando/1509-i18n-events fabrixxm 2015-09-30 08:46:57 +02:00
  • 2fc9e426a2 Merge pull request #1910 from annando/1509-new-feed-import fabrixxm 2015-09-30 08:46:08 +02:00
  • 337aef87ef port of reds geotag feature rabuzarus 2015-09-30 00:19:54 +02:00
  • 3d7602a5a3 don't show profile photos in albums to others than the owner or remote user rabuzarus 2015-09-29 19:44:26 +02:00
  • 6e981ed798 Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events Michael Vogel 2015-09-29 10:35:50 +02:00
  • abe31d7e60 Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import Michael Vogel 2015-09-29 10:27:04 +02:00
  • 5d5d85eb4a Merge remote-tracking branch 'upstream/develop' into 1509-worker Michael Vogel 2015-09-29 10:25:59 +02:00
  • 880dda4257 Merge branch 'master' back into develop Fabrixxm 2015-09-29 10:00:13 +02:00
  • 4b6afbf681 Merge branch '3.4.2' Fabrixxm 2015-09-29 09:58:16 +02:00
  • e8517c1e5c Merge pull request #1909 from fabrixxm/changelog-3.4.2 Michael Vogel 2015-09-29 09:56:59 +02:00
  • 2376cf143c Bump Friendica version Fabrixxm 2015-09-29 09:25:59 +02:00
  • 32ce091fe2 Update CHANGELOG Fabrixxm 2015-09-29 09:25:36 +02:00
  • c3ee255b0c Reduction of double executions - hopefully Michael Vogel 2015-09-29 06:15:26 +02:00
  • ed8cdc7d85 Logging message added Michael Vogel 2015-09-28 22:32:56 +02:00
  • f0cf9ce519 Prevent double execution Michael Vogel 2015-09-28 21:58:58 +02:00
  • eb75d9532b Magical mathematics to reduce the number of workers Michael Vogel 2015-09-28 19:14:07 +02:00
  • 9767801be4 Load depending number of worker queues. Michael Vogel 2015-09-28 07:54:28 +02:00