33499 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	86da77e8ee	Added two to-dos to do.	2016-01-13 10:53:38 +01:00
Michael Vogel	d1d7ab799c	Added some more documentation	2016-01-11 20:21:42 +01:00
Michael Vogel	012107f5f7	Table documentation added	2016-01-11 20:17:31 +01:00
Michael Vogel	01c2eacd46	Merge remote-tracking branch 'upstream/develop' into 1601-gcontact-total	2016-01-11 14:25:48 +01:00
Michael Vogel	941b5fd11e	Some added logging	2016-01-11 14:24:54 +01:00
fabrixxm	bf9997b91d	Merge pull request #2245 from annando/1601-diaspora-post ... Bugfix: Public posts to Diaspora could fail	2016-01-11 14:22:31 +01:00
fabrixxm	8c52bb3f44	Merge pull request #2248 from tobiasd/20160111-htconfig ... remove unsupported themes from list of allowed themes	2016-01-11 09:01:50 +01:00
Tobias Diekershoff	5c568df9a6	remove unsupported themes from list of allowed themes	2016-01-11 08:57:51 +01:00
Michael Vogel	338fa5765c	Merge pull request #2246 from tobiasd/20160111-newhere ... don't mention FB in newhere tipps	2016-01-11 08:30:33 +01:00
Tobias Diekershoff	bfdbc0c818	don't mention FB in newhere tipps	2016-01-11 07:54:52 +01:00
Michael Vogel	8d9a905c80	Bugfix: Public posts to Diaspora could fail	2016-01-10 23:08:25 +01:00
Michael Vogel	6b85fa17bb	Added some documentation	2016-01-10 19:06:34 +01:00
Michael Vogel	b4631cebed	Fixed SQL problems	2016-01-10 17:10:56 +01:00
Michael Vogel	23731fc9aa	Bugfix: The display hadn't fetched the correct contact for the uid.	2016-01-10 15:44:23 +01:00
Michael Vogel	2f49e984bd	Updated database.sql file, further code cleanup	2016-01-10 14:12:05 +01:00
Michael Vogel	214f381e81	Code cleanup	2016-01-10 12:37:49 +01:00
Michael Vogel	885dc1df81	gcontact update script, rebuilt follow page, query speedup for community and network groups	2016-01-10 09:19:00 +01:00
Michael Vogel	6703ba468a	Profile data in gcontact overwrites profile data	2016-01-08 08:02:42 +01:00
Michael Vogel	358a9fd6fd	Notify and alias will be fetched via OStatus	2016-01-08 00:35:46 +01:00
Michael Vogel	9521cdc18f	notify and alias are now in gcontact as well - the contact expansion in mod/item.php is renewed	2016-01-07 23:43:16 +01:00
Michael Vogel	fdb31abdfa	Use gcontact when adressing contacts in editor	2016-01-07 08:19:28 +01:00
Michael Vogel	5ab2786c00	Get rid of the table "unique_contacts"	2016-01-06 22:23:12 +01:00
Michael Vogel	2bad2cdd91	More fields in gcontact, contact search respects "hide" setting	2016-01-06 14:13:59 +01:00
Michael Vogel	75e2ec01fe	The gcontact will now be connected to the items	2016-01-05 15:34:27 +01:00
Michael Vogel	c8449e6019	Code cleanup	2016-01-04 20:41:24 +01:00
fabrixxm	d7410f9e47	Merge pull request #2238 from fabrixxm/develop ... Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget"	2016-01-04 11:48:41 +01:00
fabrixxm	fcf7a791f1	Revert "Merge pull request #2223 from rabuzarus/2912_photo_widget" ... This reverts commit 83e54f70d3, reversing changes made to ecf576bdd0.	2016-01-04 11:46:19 +01:00
fabrixxm	83e54f70d3	Merge pull request #2223 from rabuzarus/2912_photo_widget ... photo aside widget for profile page	2016-01-04 10:06:07 +01:00
Michael Vogel	d778e7bfb7	API: Preparation for statuses/lookup support	2016-01-04 01:00:19 +01:00
fabrixxm	ecf576bdd0	Merge pull request #2237 from tobiasd/20160103b ... moved include Scape to top of the file	2016-01-03 19:50:16 +01:00
Tobias Diekershoff	75ed2f830d	moved include Scape to top of the file	2016-01-03 19:15:13 +01:00
rabuzarus	29c671bb22	photos aside widget:permissions cleanup	2016-01-03 16:09:05 +01:00
rabuzarus	1ab022f4df	photos aside widget: move dependencies to the header	2016-01-03 15:45:02 +01:00
Michael Vogel	771d0c4bfa	Merge pull request #2224 from rabuzarus/2812_js_scrollbars ... Since we can easily remove it, we can accept this - and change it back if we need to. I haven't check accessibility - but this can be done later.	2016-01-03 14:09:17 +01:00
fabrixxm	56e7f722a8	Merge pull request #2236 from tobiasd/20160103a ... Typo in DE translations	2016-01-03 13:55:14 +01:00
Tobias Diekershoff	680f1073cb	Typo in DE translations	2016-01-03 12:57:42 +01:00
Tobias Diekershoff	2b5366ce15	Merge pull request #2235 from annando/1601-bugfix-sql-api ... Bugfix: The table name was wrong	2016-01-03 08:37:39 +01:00
Michael Vogel	ba9054d8a3	Bugfix: The table name was wrong	2016-01-03 08:12:00 +01:00
Tobias Diekershoff	9015b081ee	Merge pull request #2234 from annando/1601-bugfix-duplicate-like ... Bugfix: Duplicate check for likes wasn't reliable	2016-01-03 07:51:41 +01:00
Michael Vogel	01e20cded3	Merge pull request #2233 from fabrixxm/issue_api ... API: fix item activities count	2016-01-03 00:38:57 +01:00
Michael Vogel	fba08409b4	Some more places that need to be adjusted	2016-01-03 00:28:11 +01:00
Michael Vogel	6c3d0f82c2	Bugfix: The duplicate check for likes wasn't reliable	2016-01-03 00:17:28 +01:00
fabrixxm	20809cf725	API: fix itemactivities count ... api_format_items_likes() has now uses builtin_activity_puller() to correctly count activities	2016-01-02 12:54:57 +01:00
fabrixxm	5758302f21	small doxigen comment fix	2016-01-02 12:53:42 +01:00
Tobias Diekershoff	0f615fdcd7	Merge pull request #2232 from annando/1601-bugfix-request ... Bugfix: The request process from DFRN hadn't worked anymore	2016-01-02 10:03:48 +01:00
fabrixxm	d090dc19a7	Merge pull request #2231 from annando/1601-dont-send-to-archive ... Don't send messages to contacts that are archived	2016-01-01 17:59:02 +01:00
Michael Vogel	2ed3ae1aab	Bugfix: The request process from DFRN hadn't worked anymore since the last pull request	2016-01-01 17:49:07 +01:00
Michael Vogel	38ee2def5d	Don't send messages to contacts that are archived	2016-01-01 13:05:05 +01:00
Tobias Diekershoff	9d4d29ad9e	Merge pull request #2228 from fabrixxm/issue_api ... Fix small bug in api	2015-12-31 09:49:28 +01:00
Tobias Diekershoff	8a5fada863	Merge pull request #2138 from fabrixxm/dbstructure_multicolumn_primarykey ... Allow multicolumn primary keys in dbstructure	2015-12-31 09:49:00 +01:00