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

Commit Graph

  • 0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" Michael Vogel 2016-06-25 13:56:55 +02:00
  • 84263ee8de frio: Wallmessage - distinguish between own and foreign host rabuzarus 2016-06-25 13:02:53 +02:00
  • 073f520cee add missing strings for frio rabuzarus 2016-06-25 12:21:13 +02:00
  • e2023b6667 Store the guid value as well. Michael Vogel 2016-06-25 11:52:52 +02:00
  • ec5b3109e4 Support for the case when the guid and public key will vanish from webfinger Michael Vogel 2016-06-25 00:38:47 +02:00
  • f8a20a15d3 Merge pull request #2633 from annando/1606-author-id-update Tobias Diekershoff 2016-06-24 07:03:46 +02:00
  • 782e31c5cf Merge pull request #2634 from rabuzarus/2306_Update_Network Tobias Diekershoff 2016-06-24 06:59:35 +02:00
  • cf696f6d1f network.php - raw && update mode don't need the network tabs rabuzarus 2016-06-24 00:33:31 +02:00
  • eabf8734a8 Merge pull request #2631 from rabuzarus/1906-event-test Michael Vogel 2016-06-23 23:24:27 +02:00
  • c7373dcec4 author-id/owner-id: Post update function/added database documentation Michael Vogel 2016-06-23 21:15:54 +02:00
  • 55205e344f Merge pull request #2632 from annando/1606-parse-title rabuzarus 2016-06-23 10:18:58 +02:00
  • e352458ef0 pub calendar - permission clean up and docu rabuzarus 2016-06-23 10:07:13 +02:00
  • 8cabcda5e0 Always parse the first title element Michael Vogel 2016-06-22 21:00:58 +02:00
  • 111f77ac64 pub calendar - add sql perms to the query (I forgot to do this) rabuzarus 2016-06-22 15:06:14 +02:00
  • cd92a0dc34 Merge pull request #2624 from annando/1606-contact-id rabuzarus 2016-06-22 14:26:39 +02:00
  • 2cac69ca86 cal export && public calendar - even better permissions testing rabuzarus 2016-06-22 13:50:47 +02:00
  • 8cc5dd35e8 cal export && public calendar - fix permissions rabuzarus 2016-06-22 00:39:52 +02:00
  • 49c19a3c00 Merge pull request #2628 from rabuzarus/1906-event-test Michael Vogel 2016-06-21 22:48:31 +02:00
  • d8d24baa55 Merge pull request #2630 from dissolve/mf2updates fabrixxm 2016-06-21 20:48:09 +02:00
  • 864cf0f70d update MF2 and vcard data for issue #2629 Ben Roberts 2016-06-21 10:23:43 -04:00
  • 9a7653a4fe Store the author-id and owner-id in mod/item.php as well Michael Vogel 2016-06-21 07:54:45 +02:00
  • 266fea3874 Merge remote-tracking branch 'upstream/develop' into 1606-contact-id Michael Vogel 2016-06-21 00:10:24 +02:00
  • 5324023d52 Merge pull request #2627 from annando/1606-diaspora-uri rabuzarus 2016-06-20 23:43:40 +02:00
  • d076f61a4a cal export - little fix for json rabuzarus 2016-06-20 23:38:34 +02:00
  • 71c9f562ae move the cal addon (exporting calendars) to core rabuzarus 2016-06-20 23:31:49 +02:00
  • a657377616 Diaspora: Try to fetch the uri if we already received the message Michael Vogel 2016-06-20 22:48:55 +02:00
  • 40a44f1571 Some manual revert ... Michael Vogel 2016-06-20 22:48:09 +02:00
  • 467176fa65 Diaspora: Ensure that we always store the correct URI Michael Vogel 2016-06-20 22:43:14 +02:00
  • 939bd965c5 Search query optimized Michael Vogel 2016-06-20 22:03:40 +02:00
  • b411380c4c Merge pull request #2625 from rabuzarus/1906-event-test Michael Vogel 2016-06-20 14:26:27 +02:00
  • 80f5065eb0 frio: disable the events module link in the profile tab rabuzarus 2016-06-20 13:44:11 +02:00
  • 65b541413f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id Michael Vogel 2016-06-20 07:28:47 +02:00
  • 140886a6a5 Updated database.sql Michael Vogel 2016-06-20 06:29:56 +02:00
  • 9aa5c2f821 Merge pull request #2623 from rabuzarus/1906-event-test Michael Vogel 2016-06-20 06:23:25 +02:00
  • 9ea9494a9e Merge pull request #2620 from dissolve/2617 Tobias Diekershoff 2016-06-20 00:06:52 +02:00
  • 7495a34b32 implement a public calendar for vistors of someones profile page rabuzarus 2016-06-19 22:04:34 +02:00
  • 51b5d16f1b Improved SQL queries Michael Vogel 2016-06-19 21:41:06 +02:00
  • 0adff6f6b8 Fix for author-thumb/owner-thumb - DFRN: Relocate stuff Michael Vogel 2016-06-19 20:01:25 +02:00
  • 91db7a549c Optimised the amount of function for the item query Michael Vogel 2016-06-19 08:32:38 +02:00
  • c3ed6f7d01 Improved default value handling Michael Vogel 2016-06-19 01:22:32 +02:00
  • e512a83ecc Massively updated avatar handling Michael Vogel 2016-06-19 01:07:20 +02:00
  • d0033ca5cf Merge pull request #2621 from rabuzarus/1206-events-template Michael Vogel 2016-06-18 21:32:07 +02:00
  • ee0942b96d frio - events - fix double click on date rabuzarus 2016-06-18 15:23:35 +02:00
  • bf2e23c205 Merge pull request #2616 from rabuzarus/1206-events-template Michael Vogel 2016-06-18 15:01:00 +02:00
  • 1b896fd16d Merge pull request #2615 from rabuzarus/1606-texthighlight Michael Vogel 2016-06-18 14:56:54 +02:00
  • 22de27327c recreate fix for #2617 on correct branch Ben Roberts 2016-06-18 08:16:09 -04:00
  • e2f8673076 Merge branch 'develop' of https://github.com/friendica/friendica into develop Silke Meyer 2016-06-17 18:36:38 +02:00
  • b977efc95c code highlight - some spacing for readability rabuzarus 2016-06-17 15:29:01 +02:00
  • 48a77af49d frio - events - delete unneeded css rabuzarus 2016-06-17 14:52:42 +02:00
  • 134d5949d5 frio - events - restore lost css bracket after merging develop branch rabuzarus 2016-06-17 14:39:59 +02:00
  • d0900c5389 Merge develop into 1206-events-template - restore gitignore rabuzarus 2016-06-17 14:35:24 +02:00
  • 7dc5fc8b9f Merge develop into 1206-events-template rabuzarus 2016-06-17 14:33:08 +02:00
  • 4313982e02 frio - event - code clean up + docu rabuzarus 2016-06-17 14:27:33 +02:00
  • 606f42701c frio - event - some js and template refactoring + event view css styling rabuzarus 2016-06-17 14:09:18 +02:00
  • 0148d0e5d2 frio - event - correct some js rabuzarus 2016-06-17 11:18:54 +02:00
  • 2f266382c5 code highlight - add docu rabuzarus 2016-06-17 11:02:27 +02:00
  • c99da380cf frio: events - adapt changes to the templates of the other themes rabuzarus 2016-06-17 10:33:12 +02:00
  • 8b4c416713 frio: events - split event form in different sections rabuzarus 2016-06-16 20:16:16 +02:00
  • 0167a2bd61 port of Hubzillas code highlight feature rabuzarus 2016-06-16 11:38:12 +02:00
  • 8762fb671f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id Michael Vogel 2016-06-16 10:48:52 +02:00
  • 76abade4d8 Merge pull request #2613 from rabuzarus/1506-frio_bookmarklet Michael Vogel 2016-06-16 06:37:27 +02:00
  • 7b602a20e6 frio - bookmarklet - open jot only if it is available rabuzarus 2016-06-16 00:27:45 +02:00
  • dfce0f5b64 frio: open jot modal automatically on bookmarklet page rabuzarus 2016-06-16 00:20:00 +02:00
  • e63e2a4c6c Merge pull request #2612 from annando/1606-dfrn-relocate Tobias Diekershoff 2016-06-15 23:13:20 +02:00
  • 3c9a80a31c dfrn relocate: addr field added, gcontact update added Michael Vogel 2016-06-15 21:23:22 +02:00
  • 0e35427dfc New fields "author-id" and "owner-id" in the item table Michael Vogel 2016-06-15 21:20:55 +02:00
  • 5ec7626b12 Merge pull request #2610 from rabuzarus/1406-frio-search-fix Tobias Diekershoff 2016-06-14 13:44:14 +02:00
  • 7ec13d4534 frio: fix searchbox - comment tag wasn't closed rabuzarus 2016-06-14 10:41:14 +02:00
  • 3f67e694bf Merge pull request #2609 from annando/1606-categories rabuzarus 2016-06-14 10:05:07 +02:00
  • 7f5a2d5c23 Categories were missing Michael Vogel 2016-06-14 09:50:17 +02:00
  • 3a240b73a5 Merge pull request #2607 from annando/1606-time-travel rabuzarus 2016-06-14 01:09:37 +02:00
  • a05f0c39a6 Merge remote-tracking branch 'upstream/develop' into 1606-time-travel Michael Vogel 2016-06-13 22:32:40 +02:00
  • 6e354eca14 Merge pull request #2606 from annando/1606-network-order rabuzarus 2016-06-13 22:26:10 +02:00
  • 81395fe385 Avoid time travel in posts (received before created) Michael Vogel 2016-06-13 22:21:33 +02:00
  • 2815173a52 Bugfix: Items weren't sorted correctly Michael Vogel 2016-06-13 22:20:09 +02:00
  • 365101066a Merge pull request #2605 from rabuzarus/1306-aside-group-fix Michael Vogel 2016-06-13 14:34:08 +02:00
  • 06792d6b37 frio: fix an css issue with sidebar-group checkbox alignment rabuzarus 2016-06-13 12:17:33 +02:00
  • 933f5973af Merge pull request #2604 from rabuzarus/1306-themesettings-fix Michael Vogel 2016-06-13 11:54:58 +02:00
  • 9371a004d9 Merge pull request #2603 from fabrixxm/0613-confix-fix-2 rabuzarus 2016-06-13 11:01:14 +02:00
  • 82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha rabuzarus 2016-06-13 10:57:42 +02:00
  • 6e28cdf2ee Fix Config and PConfig ::get() on new keys Fabrixxm 2016-06-13 10:28:40 +02:00
  • 5e98f27fcd frio: events - work on event_form.tpl + datetime.php rabuzarus 2016-06-13 10:19:38 +02:00
  • 869a439466 Merge pull request #2595 from annando/1606-contact-priority rabuzarus 2016-06-13 09:28:54 +02:00
  • 08d5975105 Merge pull request #2602 from annando/1606-item-query-cleanup rabuzarus 2016-06-13 09:27:21 +02:00
  • 125d80292b Some cleanup Michael Vogel 2016-06-12 23:06:48 +02:00
  • 9354d86f38 Merge pull request #2601 from rabuzarus/1206-short-info-fix Michael Vogel 2016-06-12 21:59:46 +02:00
  • cb6c2f3173 Merge pull request #2600 from rabuzarus/1106-frio-settings Michael Vogel 2016-06-12 21:59:07 +02:00
  • c68f28bc77 Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup Michael Vogel 2016-06-12 21:07:45 +02:00
  • c05898c57d The queries for items are unified (a little bit) Michael Vogel 2016-06-12 21:04:55 +02:00
  • 468f2d001e frio: scrollspy info - forgot to change all classes rabuzarus 2016-06-12 20:34:41 +02:00
  • 605399032d frio: bind short-info scrollspy on class fn (insteadof p-addr) rabuzarus 2016-06-12 20:25:30 +02:00
  • 85efa93898 frio: little css fix rabuzarus 2016-06-12 20:20:17 +02:00
  • 9db614de64 frio: some template clean up rabuzarus 2016-06-12 20:09:02 +02:00
  • 18e3e814b8 Merge pull request #2599 from rabuzarus/1106-frio-settings Michael Vogel 2016-06-12 20:08:48 +02:00
  • e51d559d6c Merge pull request #2598 from rabuzarus/1206-config-fix Michael Vogel 2016-06-12 20:08:06 +02:00
  • b19af8f0b7 frio: add css for settings templates rabuzarus 2016-06-12 19:59:27 +02:00
  • 0aa15f74ff Merge develop into 1106-frio-settings rabuzarus 2016-06-12 19:34:06 +02:00
  • b2ba25bd27 fix federation statistics rabuzarus 2016-06-12 19:15:12 +02:00
  • 64753f474c fix config & pconfig rabuzarus 2016-06-12 18:55:20 +02:00
  • 0af572ffba frio: first part for event template work rabuzarus 2016-06-12 18:23:10 +02:00