clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,801 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

3045 Commits

Author SHA1 Message Date
Tobias Diekershoff bbd5878734 Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete 
new autocompletion
 2016-04-16 08:16:21 +02:00
rabuzarus ce1faf17d1 rework autocomplete: some polishing 2016-04-14 17:05:19 +02:00
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete 
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
 2016-04-14 16:23:51 +02:00
Michael Vogel d6a79abb68 Bugfix: "default_group" behaviour wasn't implemented correctly 2016-04-13 22:21:23 +02:00
Michael Vogel 71caebdae0 Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore 2016-04-13 07:00:36 +02:00
Michael Vogel 90f5cb23f2 fbrowser: Take the picture as that mostly fits 2016-04-10 13:36:26 +02:00
Tobias Diekershoff ac9d392264 make en the default language 2016-04-06 20:21:41 +02:00
Tobias Diekershoff a28372c032 intendation... 2016-04-06 20:18:33 +02:00
Tobias Diekershoff 5df20fda11 Issue 2241: added language selector to the admin wizard 2016-04-06 20:13:34 +02:00
Michael Vogel 47563d34ee Merge remote-tracking branch 'upstream/develop' into 1604-item-shadow 2016-04-03 18:46:14 +02:00
Michael Vogel 94e8139c7e issue 2247: Update more fields when relocation the server 2016-04-03 18:18:36 +02:00
Michael Vogel 9f57425d08 Post update ist now done. 2016-04-03 16:36:05 +02:00
Michael Vogel b4b62493e6 Bugfix: The nickname vanished/better way to fetch the alias 2016-04-02 15:41:55 +02:00
Michael Vogel b93e1d73a1 New OStatus implementation 2016-03-30 12:43:15 +02:00
Michael Vogel 206c26ae30 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-21 06:47:47 +01:00
Tobias Diekershoff 0bcd6886f0 Merge pull request #2419 from annando/1603-fbrowser 
Take the second largest picture as preview - not the smallest one
 2016-03-21 06:41:48 +01:00
Michael Vogel 8f00836ffb Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
Michael Vogel 186eaf1264 Take the second largest picture as preview - not the smallest one 2016-03-20 10:30:06 +01:00
Michael Vogel d676ae0f32 The signature creation now moved into the Diaspora class. That's much cleaner. 2016-03-19 15:49:47 +01:00
Michael Vogel 56cb6cc897 Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
Michael Vogel 2841aa0281 New implementation is now live. 2016-03-13 19:47:02 +01:00
Tobias Diekershoff e884b0e579 Merge pull request #2414 from annando/1603-display-query 
The display contained bad sql queries
 2016-03-13 13:18:53 +01:00
Michael Vogel 99d5f8afc6 The display contained bad sql queries 2016-03-13 13:04:12 +01:00
Michael Vogel 4020b51f8f Merge pull request #2413 from tobiasd/20160312-socnetsettings 
missing include file for the SocNet settings
 2016-03-12 19:49:03 +01:00
Tobias Diekershoff 2a864d889e missing include file for the SocNet settings 2016-03-12 16:25:17 +01:00
Michael Vogel 14a2aa552a The name in the notifications has to be double encoded 2016-03-12 09:21:13 +01:00
Michael Vogel bc21fca345 Remove the setting description from the documentation since it isn't a hidden one anymore. 2016-03-11 23:44:46 +01:00
Michael Vogel b12dbe8831 The worker settings are now available in the admin settings 2016-03-11 23:28:11 +01:00
fabrixxm d30d13959b Merge pull request #2328 from rabuzarus/0602_contact_profile 
polishing of the contact-edit page
 2016-03-06 19:56:59 +01:00
Tobias Diekershoff bdfd81e723 Merge pull request #2400 from annando/1603-ostatus-thread 
Only import OStatus threads that are started by our contacts
 2016-03-06 19:40:01 +01:00
Michael Vogel 4bd1061a09 Only import OStatus threads if we follow the thread starter 2016-03-06 14:53:30 +01:00
Michael Vogel bb06026147 Settings for only importing threads from our ostatus contacts 2016-03-06 14:09:04 +01:00
Michael Vogel 4ef33b4d5b Clarification of description 2016-03-06 13:26:30 +01:00
Michael Vogel 8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01:00
fabrixxm 3184a6263b Merge pull request #2392 from Quix0r/minor/logging 
Minor: Some more logging to trace down bugs
 2016-03-02 12:21:18 +01:00
Michael Vogel ce5f6fae51 Small bugfix: Fixes problen when version number contains linebreaks 2016-03-01 19:14:45 +01:00
Roland Haeder 7d5166c9fe
Closed TODO: no .= needed here. #2392 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 18:28:06 +01:00
Roland Haeder 76b042ddee
More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE). 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-01 14:42:55 +01:00
Tobias Diekershoff 09060c0ed3 adding some colors to the Federation Statistics page of the admin panel 2016-02-29 17:24:34 +01:00
Michael Vogel 99bac3a4d8 Corrected explanation 2016-02-24 07:22:32 +01:00
Michael Vogel eec0dbf738 Bugfix: Resharing on the display page works again. 2016-02-24 07:20:23 +01:00
rabuzarus b93326bb23 contactedit-actions-button: use internal links instead of full links 2016-02-23 19:26:03 +01:00
rabuzarus 0db83b9586 contactedit-actions-button: move repair back to tabbar 2016-02-23 19:19:45 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Michael Vogel c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Michael Vogel 7f1f549c6f Fallback when there is no nick name 2016-02-14 15:08:49 +01:00
Michael Vogel 9261154eab Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup 2016-02-13 20:12:31 +01:00
Tobias Diekershoff d0b5c16a20 Merge pull request #2351 from annando/1602-performance-unread-group 
Optimized query for unread group postings
 2016-02-13 19:43:33 +01:00
Michael Vogel bf7dedb03b Optimized query for unread group postings 2016-02-13 18:15:24 +01:00