Commit Graph

  • 01c9d13927 Issue 1871: Show an information if a group is empty Michael Vogel 2015-12-05 23:29:42 +01:00
  • b57ae80206 Issue 2122: Make sure to always return the correct number of entries Michael Vogel 2015-12-05 23:05:48 +01:00
  • a8ab1bc947 Merge pull request #2146 from annando/1512-ostatus-picture-posts Tobias Diekershoff 2015-12-05 06:47:31 +01:00
  • 8502ffceb3 Merge pull request #2145 from tobiasd/20151204-sv fabrixxm 2015-12-04 23:32:37 +01:00
  • f849ff0155 SV messages.po regenerated from strings.php Tobias Diekershoff 2015-12-04 21:31:33 +01:00
  • c50b49d303 Merge pull request #2144 from fabrixxm/quattro Tobias Diekershoff 2015-12-04 20:52:58 +01:00
  • 37a70d3204 modified: include/dbstructure.php removed uneeded break; It causes errors with php 7.0. root 2015-12-04 19:49:09 +00:00
  • 38d46b164a quattro: some love to events pages fabrixxm 2015-12-04 20:43:35 +01:00
  • 4e725c3699 Merge pull request #2142 from fabrixxm/issue_1920 Tobias Diekershoff 2015-12-04 20:29:01 +01:00
  • 6015180d4f Merge pull request #2140 from fabrixxm/issue_2046 Tobias Diekershoff 2015-12-04 20:25:33 +01:00
  • f739fdc517 Quattro: Rss icon for atom feed link in profile fabrixxm 2015-12-04 19:57:19 +01:00
  • 56a146361c modified: include/dbstructure.php Removed uneeded break; Causes errors with php 7.0, poller error message & white screen of death. root 2015-12-04 18:47:12 +00:00
  • f44846555a quattro: hide acl button in edit post fabrixxm 2015-12-04 19:29:13 +01:00
  • f3901b99a2 Fix contact popup with tinyMCE fabrixxm 2015-12-04 18:59:50 +01:00
  • 4f06107579 Fix generated po headers Fabrixxm 2015-12-04 15:47:41 +01:00
  • 4e53df7c71 Merge pull request #2141 from fabrixxm/issue_1953 Tobias Diekershoff 2015-12-04 15:39:53 +01:00
  • ddbba521c5 Add support for attending an event to frost themes Fabrixxm 2015-12-04 15:01:46 +01:00
  • d53b23858a Rewrite util/php2po.php Fabrixxm 2015-12-04 14:09:17 +01:00
  • 25c2e219ee Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts Michael Vogel 2015-12-04 07:07:34 +01:00
  • 7ac7caef08 Merge pull request #2136 from annando/1512-diaspora-retractions Tobias Diekershoff 2015-12-04 06:54:55 +01:00
  • eaf975faae Merge pull request #2130 from annando/1512-contact-rework Tobias Diekershoff 2015-12-04 06:53:29 +01:00
  • 37bd03422b The preview picture can now be remote or local Michael Vogel 2015-12-04 06:50:23 +01:00
  • 540d217134 Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts Michael Vogel 2015-12-04 06:05:12 +01:00
  • f82ce0de66 Merge branch '1512-ostatus-picture-posts' of github.com:annando/friendica into 1512-ostatus-picture-posts Michael Vogel 2015-12-04 06:00:56 +01:00
  • bb45112544 OStatus: Picture posts are reformatted Michael Vogel 2015-12-04 05:57:33 +01:00
  • dfbc5c39f5 Merge pull request #2139 from rabuzarus/0312_ping_cleanup Michael Vogel 2015-12-04 05:50:49 +01:00
  • 25e2a849c4 Merge pull request #2135 from rabuzarus/doxygen Michael Vogel 2015-12-04 05:47:59 +01:00
  • d94b96e546 ping: docu fix rabuzarus 2015-12-03 22:51:00 +01:00
  • 4b7f080c46 ping: further work rabuzarus 2015-12-03 22:42:53 +01:00
  • 5ff9fbb013 doxygen: correct mistake - .gitignore shouldn't be submitted rabuzarus 2015-12-03 21:22:13 +01:00
  • b4213d0e9e doxygen: delete wrong commited file rabuzarus 2015-12-03 17:30:34 +01:00
  • c0406918ec ping: cleanup rabuzarus 2015-12-03 17:15:49 +01:00
  • 95508bf4bb Allow multicolunn primary keys in dbstructure Fabrixxm 2015-12-03 16:39:20 +01:00
  • 76bb3f6673 doxygen: exclude some more folders rabuzarus 2015-12-03 16:17:25 +01:00
  • 1a170c8743 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework Michael Vogel 2015-12-03 14:38:04 +01:00
  • 1f9644bded Merge pull request #2131 from rabuzarus/3011_hcard_vcard Michael Vogel 2015-12-03 14:16:52 +01:00
  • 24f1a24208 Support for a new Diaspora command for post retraction Michael Vogel 2015-12-03 08:35:47 +01:00
  • 8522446891 little cleanup: insert new line at the end rabuzarus 2015-12-03 00:11:18 +01:00
  • 3af7cff281 remove unneeded function page_type_translate() rabuzarus 2015-12-03 00:08:43 +01:00
  • b31c602e9b added code reference to docs rabuzarus 2015-12-03 00:06:11 +01:00
  • d963cdfe48 photos-albms widget: add some classes rabuzarus 2015-12-02 20:01:22 +01:00
  • 4286225f37 Added/Changed accesskeys for the new tab actions Michael Vogel 2015-12-02 07:56:10 +01:00
  • 7ed73a06ab Solved a problem with author links that are different from what is provided in the contact Michael Vogel 2015-12-01 23:51:34 +01:00
  • 4798675e6e Merge pull request #2132 from rabuzarus/0112_vier_css Michael Vogel 2015-12-01 22:40:56 +01:00
  • 1d6d9d3d24 photos-albms widget: add some classes rabuzarus 2015-12-01 21:07:05 +01:00
  • cd7ec72b20 unify hcard and vcard: make $pdesc available in hcard&vcard rabuzarus 2015-12-01 19:47:23 +01:00
  • c45b16d2a1 Unifying the texts. Michael Vogel 2015-12-01 19:02:03 +01:00
  • 39b37281a7 Merge develop into 3011_hcard_vcard rabuzarus 2015-12-01 18:34:13 +01:00
  • 89c5989cfb unify hcard and vcard rabuzarus 2015-12-01 18:31:08 +01:00
  • 06a4b0dc5e Header removed in the contact area Michael Vogel 2015-12-01 18:21:05 +01:00
  • fe900ac576 Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework Michael Vogel 2015-12-01 17:16:31 +01:00
  • 6910604ffb Merge pull request #2125 from rabuzarus/2911_event_template Michael Vogel 2015-12-01 17:13:46 +01:00
  • 0dee14d91d Merge pull request #2129 from annando/1512-diaspora-cid fabrixxm 2015-12-01 17:11:35 +01:00
  • 50a46c2c6e Merge pull request #2127 from tobiasd/20151201-de Michael Vogel 2015-12-01 17:01:47 +01:00
  • 107204f405 Diaspora comments/likes: The contact id and the network is now taken from the contact Michael Vogel 2015-12-01 15:36:32 +01:00
  • 9e0a15c972 Merge pull request #2128 from tobiasd/20151201-issue2079 fabrixxm 2015-12-01 14:33:25 +01:00
  • 51d392b97f add the module to the page title Tobias Diekershoff 2015-12-01 14:19:06 +01:00
  • 91bac8a6e0 DE translations THX Abrax Tobias Diekershoff 2015-12-01 13:56:23 +01:00
  • 1c93729c46 Tab is added to "all friends" and "common friends" Michael Vogel 2015-12-01 08:12:05 +01:00
  • 146f386e37 Merge pull request #2126 from annando/1511-duplicates Tobias Diekershoff 2015-12-01 06:07:18 +01:00
  • 712b3c7593 Merge pull request #2121 from rabuzarus/3011_viewcontactstitle Michael Vogel 2015-11-30 23:29:35 +01:00
  • b0898cc461 Bugfix: The duplicate check sometimes seemed to have scrambled the posts Michael Vogel 2015-11-30 23:13:56 +01:00
  • 0278e60664 Merge pull request #2104 from rabuzarus/2611_contacts_directory Michael Vogel 2015-11-30 18:07:35 +01:00
  • 2ce64c2496 change shortcut for viewcontacts + shortcut docu rabuzarus 2015-11-30 16:23:03 +01:00
  • 39b85c8486 vier event_form: include bb-tags for editing rabuzarus 2015-11-30 16:00:41 +01:00
  • 2753e62483 Merge pull request #2119 from annando/1511-contact-evolution fabrixxm 2015-11-30 14:45:23 +01:00
  • 5126b3938c Merge pull request #2124 from tobiasd/20151130-messagespo-credits Michael Vogel 2015-11-30 13:58:48 +01:00
  • 6da6504738 regenerated master messages.po file Tobias Diekershoff 2015-11-30 13:16:46 +01:00
  • 50c004aa5f regenerated credits.txt Tobias Diekershoff 2015-11-30 13:16:23 +01:00
  • a60b702df1 Merge pull request #2113 from annando/1511-manage-notifications fabrixxm 2015-11-30 12:04:53 +01:00
  • 4efb6c6f79 Merge pull request #2120 from rabuzarus/2911_network_header Michael Vogel 2015-11-30 08:30:34 +01:00
  • 8c35304013 Some SQL improvements Michael Vogel 2015-11-30 08:25:11 +01:00
  • 45c2a4868e make viewcontacts part of the profile tab rabuzarus 2015-11-30 03:25:23 +01:00
  • a6aac8f950 networkheader: do css work the other supported themes rabuzarus 2015-11-30 01:24:22 +01:00
  • a638417ab5 Show contact comments in the post Michael Vogel 2015-11-29 23:46:10 +01:00
  • 91011b7190 Removing of useless code Michael Vogel 2015-11-29 23:36:19 +01:00
  • a7ea6ef096 Use the template for the header. Michael Vogel 2015-11-29 23:33:32 +01:00
  • 42d903dd68 Redesign of the contact pages, new tab for contact statuses Michael Vogel 2015-11-29 23:22:05 +01:00
  • f45a8f1a03 Merge pull request #2106 from annando/1511-ostatus-bookmark-design Tobias Diekershoff 2015-11-29 23:19:12 +01:00
  • d3d0647ff8 Merge pull request #2108 from annando/1511-optimize-tables Tobias Diekershoff 2015-11-29 23:18:06 +01:00
  • 93fd6dce84 Merge pull request #2111 from annando/issue-1925 Tobias Diekershoff 2015-11-29 19:48:08 +01:00
  • ca47c1c4df Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution Michael Vogel 2015-11-29 17:05:40 +01:00
  • 5649e9e193 The contact page now contains more data Michael Vogel 2015-11-29 17:04:48 +01:00
  • 70860e5836 new_event: default size of textfields rabuzarus 2015-11-29 16:16:18 +01:00
  • 3f2a55c267 Merge pull request #2118 from annando/1511-supported-networks Tobias Diekershoff 2015-11-29 16:03:10 +01:00
  • 69de262e97 Merge pull request #2117 from annando/1511-feed-remote Tobias Diekershoff 2015-11-29 15:56:24 +01:00
  • 2fabde5d2d Added the old Facebook addon for addon check Michael Vogel 2015-11-29 13:42:31 +01:00
  • 8b23e77171 Only show supported networks in sidebar and contact list Michael Vogel 2015-11-29 13:37:24 +01:00
  • 56e7b2002d Merge pull request #2116 from tobiasd/2110-followup Michael Vogel 2015-11-29 12:03:25 +01:00
  • 1cd06df5fa Bugfix: Only show the feed link for local profiles Michael Vogel 2015-11-29 12:02:14 +01:00
  • ba441789b9 followup for #2110 putting the styling in less file and recompile css Tobias Diekershoff 2015-11-29 11:18:32 +01:00
  • 583a2f709b Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design Michael Vogel 2015-11-29 10:25:44 +01:00
  • c77ef0c493 Viewcontacts now only shows native contacts (no more connector contacts) Michael Vogel 2015-11-29 09:56:34 +01:00
  • 00cc409461 The photo menu now respects if the local users differs from the contact owner Michael Vogel 2015-11-29 09:35:35 +01:00
  • a770be3cb6 Merge pull request #2107 from annando/1511-duplicated-keywords Tobias Diekershoff 2015-11-29 08:43:19 +01:00
  • b67f33f6d5 Merge pull request #2109 from annando/1511-duplicated-tags-diaspora Tobias Diekershoff 2015-11-29 08:42:10 +01:00
  • be40fb8186 Merge pull request #2110 from annando/1511-subscribe-feed Tobias Diekershoff 2015-11-29 08:40:39 +01:00
  • 78858cb57d Merge pull request #2114 from rabuzarus/28.11_forumlist Tobias Diekershoff 2015-11-29 08:21:37 +01:00
  • 1a0cb99d56 redesign the network page header when cid selected rabuzarus 2015-11-29 04:57:42 +01:00
  • 73dbd73990 directory - little change in the sql query rabuzarus 2015-11-29 00:09:09 +01:00