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

Commit Graph

  • ed280df383 typo in side panel link Tobias Diekershoff 2015-02-04 11:27:54 +01:00
  • 29f732e811 More details in the location field for poco. Michael Vogel 2015-02-04 10:43:30 +01:00
  • fd2a4c731e Merge pull request #1352 from tobiasd/20150204_red fabrixxm 2015-02-04 09:01:17 +01:00
  • 710bd08c30 adopting red matrix iconography for red# Tobias Diekershoff 2015-02-04 08:47:57 +01:00
  • 2c4c8a6b21 Merge remote-tracking branch 'friendica/release-3.3.3' into develop Fabrixxm 2015-02-04 08:32:44 +01:00
  • 04f91aafac Merge pull request #1337 from annando/1501-html-in-poco fabrixxm 2015-02-04 08:29:21 +01:00
  • f39e2803f8 Merge pull request #1351 from annando/1501-central-item-storage Tobias Diekershoff 2015-02-03 20:38:25 +01:00
  • b27d6f1a82 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage Michael Vogel 2015-02-03 20:08:47 +01:00
  • 11fd20fdc2 Merge pull request #1346 from tobiasd/20150202-strings Tobias Diekershoff 2015-02-03 20:05:11 +01:00
  • 524e2102cf Merge pull request #1350 from annando/1502-diabook-disable-features Tobias Diekershoff 2015-02-03 20:05:01 +01:00
  • 4e637ae89d Merge pull request #1347 from silke/vagrant Tobias Diekershoff 2015-02-03 20:04:27 +01:00
  • f5ec5a4349 Some diabook features can dramatically slow down the system. There is a new switch to disable this. Michael Vogel 2015-02-03 19:59:47 +01:00
  • 226b551c85 Only some code beautification. Michael Vogel 2015-02-03 07:00:01 +01:00
  • 9851965090 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage Michael Vogel 2015-02-03 00:30:37 +01:00
  • 86a968002d Look for links to diaspora posts and try to fetch them if they aren't on the system. Michael Vogel 2015-02-03 00:29:21 +01:00
  • 1b41c837ea Documented the Vagrant test data. Silke Meyer 2015-02-02 23:14:01 +01:00
  • 4ad2859a4e Added mysql dump with some test data. Not imported by default. Silke Meyer 2015-02-02 22:58:08 +01:00
  • 05af400937 Fixed missing sudo, improved local mail in vagrant. Silke Meyer 2015-02-02 22:57:10 +01:00
  • e34636625f updated master string file Tobias Diekershoff 2015-02-02 22:41:38 +01:00
  • 99e42e1274 Merge pull request #1345 from annando/1501-api-speedup Tobias Diekershoff 2015-02-02 22:35:56 +01:00
  • 8d0030c9d5 Revert some stuff from another pull request. I like git ... Michael Vogel 2015-02-02 22:24:21 +01:00
  • 8490bedefe Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage Michael Vogel 2015-02-02 22:15:39 +01:00
  • 62b32e7c93 Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup Michael Vogel 2015-02-02 22:08:40 +01:00
  • b41d14afe3 Merge pull request #1343 from annando/1502-diaspora-guid-links Tobias Diekershoff 2015-02-02 22:03:09 +01:00
  • 677f46c076 Merge pull request #1338 from annando/1501-global-contacts Tobias Diekershoff 2015-02-02 21:52:09 +01:00
  • 2efc789aee Merge pull request #1339 from annando/1502-bugfix-friend-notification-diaspora Tobias Diekershoff 2015-02-02 21:51:35 +01:00
  • 09b90244c3 Merge pull request #1344 from annando/1502-new-vier-version Tobias Diekershoff 2015-02-02 21:50:54 +01:00
  • 9c0dc86eea Merge pull request #1342 from tobiasd/20150202_admin Michael Vogel 2015-02-02 21:14:41 +01:00
  • dbe52c74b5 Added Beanow as author, since he did most of the last changes. Michael Vogel 2015-02-02 21:03:14 +01:00
  • 9f0e19762e New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow! Michael Vogel 2015-02-02 21:00:32 +01:00
  • e5766a4793 make strings translate able Tobias Diekershoff 2015-02-02 20:37:05 +01:00
  • 46dd453e5b Diaspora internal GUID links are now converted correctly. Michael Vogel 2015-02-02 20:26:05 +01:00
  • 80ee58f8aa Just an added to-do comment Michael Vogel 2015-02-02 20:24:19 +01:00
  • 8a17c3d348 added diagnostics tools to the admin side panel Tobias Diekershoff 2015-02-02 18:26:38 +01:00
  • d1c3d897d8 preps to read mail in vagrant Silke Meyer 2015-02-02 16:05:47 +01:00
  • 9d155a62f9 New function to fetch and store an item based on the guid. Michael Vogel 2015-02-01 21:54:44 +01:00
  • 1fb79a1a59 Merge pull request #1333 from tobiasd/20150131_ptbr Michael Vogel 2015-02-01 16:40:24 +01:00
  • f1e42b73a8 Merge pull request #1335 from silke/issue1329 Michael Vogel 2015-02-01 16:40:00 +01:00
  • 75c60b2595 The alias can - or can not - be an SSL link. Michael Vogel 2015-02-01 16:32:58 +01:00
  • 57a80c3867 Let the browser check if it's a valid email address Silke Meyer 2015-02-01 16:25:49 +01:00
  • d1dd50e9b0 Diaspora: The "new friend" notification now respects the corresponding setting/"new friend" notification isn't send via "remote self" anymore. Michael Vogel 2015-02-01 16:04:16 +01:00
  • 9ccc6746be Merge remote-tracking branch 'upstream/develop' into 1501-api-speedup Michael Vogel 2015-02-01 13:33:26 +01:00
  • b95d34f9db Aliases are now handled correctly. The public item copy gets a "real" contact id as well. Michael Vogel 2015-02-01 13:32:05 +01:00
  • e02b982f77 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage Michael Vogel 2015-02-01 13:28:32 +01:00
  • e3da549ab5 Reshared diaspora items that aren't on this server are now stored with uid=0 Michael Vogel 2015-02-01 10:26:35 +01:00
  • 6eb4254d06 The query after an API post was improved to make it faster. Michael Vogel 2015-01-31 23:13:21 +01:00
  • a7e190b0cb Bugfix: The portable contacts send data as html but was expected to be bbcode. Now the html is converted to bbcode. Michael Vogel 2015-01-31 22:57:05 +01:00
  • 61a227dbaa Changed the "From" field for system emails from product to sitename. Silke Meyer 2015-01-31 18:44:30 +01:00
  • bb2413ddaf deleted my comment of the original line Silke Meyer 2015-01-31 18:41:05 +01:00
  • 8991319d9d Added a description to the help field Silke Meyer 2015-01-31 16:09:59 +01:00
  • c90e47556a added setting for server's sender email address Silke Meyer 2015-01-31 15:54:12 +01:00
  • 89946b8660 fixed a typo Silke Meyer 2015-01-31 15:23:36 +01:00
  • a485653d6b Added setting to customize system notifications' sender email address Silke Meyer 2015-01-31 08:46:05 +01:00
  • ac86aa5822 PT-BR: update to the strings Tobias Diekershoff 2015-01-31 08:42:36 +01:00
  • 86afc21841 Merge pull request #1332 from silke/develop Tobias Diekershoff 2015-01-30 22:56:39 +01:00
  • 1f5d8167c7 Added local mail delivery for vagrant (postfix). Silke Meyer 2015-01-30 17:03:42 +01:00
  • 2d02153df1 Merge pull request #1328 from friendica/release-3.3.3 fabrixxm 2015-01-29 10:18:46 +01:00
  • 4cf36ec2cf Update FRIENDICA_VERSION fabrixxm 2015-01-29 09:44:48 +01:00
  • cfb6d4c5c1 Merge pull request #1327 from annando/1501-more-stuff-to-proxy Tobias Diekershoff 2015-01-29 08:19:20 +01:00
  • 036ccf84de And yet another two places where pictures have to be sent through the proxy. Michael Vogel 2015-01-28 23:34:46 +01:00
  • b91d8a1039 Merge pull request #1325 from annando/1501-more-stuff-to-proxy Tobias Diekershoff 2015-01-28 11:16:50 +01:00
  • b309187e3d Just two more places where pictures have to be send through the proxy function. Michael Vogel 2015-01-28 10:09:16 +01:00
  • 147413507b Merge pull request #1320 from tobiasd/20150127adminpanel fabrixxm 2015-01-28 08:24:29 +01:00
  • 5ad8b6abf6 Merge pull request #1322 from tugelbend/develop Tobias Diekershoff 2015-01-28 08:04:04 +01:00
  • a8206f6fe1 Merge pull request #1324 from annando/issue-1323 Tobias Diekershoff 2015-01-28 08:03:38 +01:00
  • c058be9908 Issue 1323: Contact pictures from the acl selector weren't proxied. Michael Vogel 2015-01-28 01:22:42 +01:00
  • 04ab875a62 Added "about" to noscrape. Michael Vogel 2015-01-27 19:52:54 +01:00
  • 3dcc1da88b bug fix: syntax error #1321 hauke 2015-01-27 18:21:32 +01:00
  • d6d7ba87a0 Merge pull request #1319 from annando/1501-better-contact-list Tobias Diekershoff 2015-01-27 14:36:56 +01:00
  • 3df7370fa8 add links to the plugin config pages for active plugins Tobias Diekershoff 2015-01-27 14:34:11 +01:00
  • 6a34210353 Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list Michael Vogel 2015-01-27 10:20:00 +01:00
  • cd7d29d13e Merge pull request #1318 from annando/1501-global-contacts Tobias Diekershoff 2015-01-27 08:25:30 +01:00
  • 848c09935a The contact list in mails now contains not only the name but also the address. Michael Vogel 2015-01-27 08:04:24 +01:00
  • 583c2ce13e poco can now be used to query the global contacts. Michael Vogel 2015-01-27 08:01:37 +01:00
  • e8bfa32b37 Scrape now doesn't fetch page data when its twitter and Co./Update script that updates the contacts from the profile Michael Vogel 2015-01-26 01:07:15 +01:00
  • bc2c046446 poco: Only update the global contacts when there is a network value/Export your own contact as well Michael Vogel 2015-01-25 16:40:20 +01:00
  • 105d6a22a4 gender will be updated in the profiles as well. Michael Vogel 2015-01-25 13:22:25 +01:00
  • 2f400627c7 Support for keywords and gender in (global) contacts. Michael Vogel 2015-01-25 13:19:37 +01:00
  • 44df625bad Merge pull request #1305 from tobiasd/20150123-quaddro fabrixxm 2015-01-25 11:59:17 +01:00
  • 174d78c768 Merge pull request #1317 from tobiasd/20150125cs fabrixxm 2015-01-25 11:55:22 +01:00
  • dff2384e82 Merge remote-tracking branch 'upstream/develop' into 1501-global-contacts Michael Vogel 2015-01-25 08:44:42 +01:00
  • c35e92b201 Merge pull request #1314 from annando/1501-better-diaspora-reshare Tobias Diekershoff 2015-01-25 08:25:02 +01:00
  • 1c424a5425 Merge pull request #1315 from annando/1501-issue-1283 Tobias Diekershoff 2015-01-25 08:24:21 +01:00
  • fc62c329c5 Merge pull request #1316 from annando/issue-1197 Tobias Diekershoff 2015-01-25 08:23:52 +01:00
  • 5cb3a0fced CS update to the strings Tobias Diekershoff 2015-01-25 08:21:55 +01:00
  • 597ef20b71 "about" and "location" is now included in global contacts as well. Michael Vogel 2015-01-25 02:29:46 +01:00
  • cd41746597 Moved the "test" folder to "local" Michael Vogel 2015-01-25 01:09:47 +01:00
  • cb9196f6d6 Issue 1197: New hook for "oembed_fetch_url" Michael Vogel 2015-01-25 00:58:51 +01:00
  • 5639f0448b Merge pull request #1309 from tobiasd/20150124-defr Michael Vogel 2015-01-25 00:43:13 +01:00
  • 4f2af23122 Merge pull request #1310 from tobiasd/20150124admin Michael Vogel 2015-01-25 00:42:11 +01:00
  • 344210bd6d Global contacts are now added with reshares as well. Better support for "aboutme" and "location" in poco. Michael Vogel 2015-01-25 00:19:59 +01:00
  • 58d814b793 issue 1283 - Share-it button support for friendica Michael Vogel 2015-01-25 00:10:58 +01:00
  • 5c4d55c5e8 Diaspora: Reshares are now working more reliable Michael Vogel 2015-01-25 00:01:58 +01:00
  • eaaed02ffd use type email in users settings as well Tobias Diekershoff 2015-01-24 09:40:01 +01:00
  • 8b558eb7ea type email for email field in add user form Tobias Diekershoff 2015-01-24 09:30:44 +01:00
  • a33ca89bb7 adding missing styling to the ignore button in quattro Tobias Diekershoff 2015-01-24 07:22:55 +01:00
  • c5b8956730 FR update to the strings Tobias Diekershoff 2015-01-24 07:05:55 +01:00
  • 619f2a86f3 DE update to the strings Tobias Diekershoff 2015-01-24 07:05:42 +01:00
  • d3bb944700 making the ignore button in contact suggestions visible in quattro Tobias Diekershoff 2015-01-23 09:51:24 +01:00
  • f3d49cbfa8 Merge pull request #1304 from tobiasd/20150122 fabrixxm 2015-01-23 08:29:54 +01:00