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

9423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fabrixxm 9570c2894c Merge pull request #1291 from silke/docs 
Update docs
 2015-01-14 14:58:46 +01:00
Silke Meyer ce259c1cc7 Updated "Tips for new members" section 2015-01-14 14:05:21 +01:00
Silke Meyer ddff2e0da0 Removed part about sponsored bugs. 2015-01-14 13:50:01 +01:00
Michael Vogel 7d34648373 Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus 2015-01-12 20:49:00 +01:00
Tobias Diekershoff e03a5ec761 Merge pull request #1287 from annando/1501-poci-with-location 
Poco now shows "about" and the location as well
 2015-01-12 07:35:42 +01:00
Michael Vogel beaca70126 OStatus: Replies now arrive their target. 2015-01-12 00:14:51 +01:00
Michael Vogel f6ee51bcd7 Merge remote-tracking branch 'upstream/develop' into 1501-poci-with-location 2015-01-11 00:51:14 +01:00
Michael Vogel 94fb0305f7 Poco now shows "about" and the location as well. 2015-01-10 00:34:08 +01:00
fabrixxm 418ac91c31 Merge pull request #1274 from annando/issue-1218 
Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined
 2015-01-09 11:44:38 +01:00
Tobias Diekershoff c3797919a5 Merge pull request #1284 from ddorian1/develop 
fix merge function of util/run_xgettext.sh
 2015-01-09 08:43:53 +01:00
Tobias Diekershoff a21fe4059b Merge pull request #1285 from annando/1501-enhanced-poco 
"location" and "about" for contacts, improved suggestions, improved contacts exchange
 2015-01-09 08:37:05 +01:00
Johannes Schwab 1a8ea8ba14 fix merge function of util/run_xgettext.sh 2015-01-08 13:59:42 +01:00
Michael Vogel ab3cad89ae Only suggest contacts with networks. 2015-01-08 11:01:55 +01:00
Michael Vogel 8f1cfac20a The global contacts now contain the network name so that the suggestions can select between this. 2015-01-08 07:59:20 +01:00
Michael Vogel 46db8575a0 The table "unique_contacts" now has an "about" and "location" field as well. 2015-01-08 01:32:19 +01:00
Michael Vogel 044eaa778f Markdown is now supported in the location field as well. 2015-01-08 00:13:43 +01:00
Michael Vogel e7e3857f5c The "about" section is now run through bbcode. 2015-01-07 18:06:32 +01:00
Michael Vogel b36d799044 Fetching "location" and "about" from diaspora. Displaying them on the "display" page. 2015-01-07 01:46:13 +01:00
Michael Vogel a2a393a3c6 Better check for Diaspora accounts so you can connect them from the /suggest page. 2015-01-06 12:31:44 +01:00
Michael Vogel 5684ba4442 Now the glink table is written as well in the poco_check function. 2015-01-06 08:16:15 +01:00
Michael Vogel 1a5a00bef8 While storing an item, now every contact is stored in the gcontact table. 2015-01-06 07:23:11 +01:00
Michael Vogel 16e4e61cc5 Only show contacts from open networks 2015-01-05 22:44:55 +01:00
Michael Vogel d35b13fb58 Merge pull request #1282 from fabrixxm/remove-eval 
remove `util/typohelper.php` and call `php -l` in `util/typo.php` to
 2015-01-05 14:32:53 +01:00
Michael Vogel 011f5b9cae Bugfix: Postings disappeared due to a small variable ... 2015-01-05 14:28:17 +01:00
fabrixxm 6c66ebf806 remove util/typohelper.php and call php -l in util/typo.php to 
check syntax errors
 2015-01-05 11:59:12 +01:00
fabrixxm 167bdd7a94 Merge pull request #1281 from tobiasd/20150105quattro 
add thread un/ignore functionality to quattro theme
 2015-01-05 11:20:23 +01:00
Tobias Diekershoff b0ffe11b21 add thread un/ignore functionality to quattro theme 2015-01-05 09:05:27 +01:00
Michael Vogel d49c3e99ac Suggest only active accounts. Remove duplicates from gcontact table. 2015-01-05 08:03:29 +01:00
Michael Vogel 47560fc6c7 Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco 2015-01-04 21:07:45 +01:00
Tobias Diekershoff a774d72d97 Merge pull request #1280 from annando/1501-too-large-file-in-redirection 
Memory problems because of too large files
 2015-01-04 20:56:49 +01:00
Michael Vogel 003e87b112 Merge remote-tracking branch 'upstream/develop' into issue-1218 2015-01-04 20:21:49 +01:00
Michael Vogel 47129c01f8 Check for filesize before trying to fetch site infos. 2015-01-04 20:04:59 +01:00
Michael Vogel 8072d4be1b Merge remote-tracking branch 'upstream/develop' into 1501-too-large-file-in-redirection 2015-01-04 19:51:25 +01:00
Michael Vogel 7084adfd1c Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco 
Conflicts:
	boot.php
	update.php
 2015-01-04 19:32:08 +01:00
Michael Vogel 11c82816b3 Poco now returns the last update date as well. This date will be stored in the gcontact table. 2015-01-04 19:19:47 +01:00
Tobias Diekershoff d9f28b9b1c Merge pull request #1279 from annando/1501-wrong-encoding 
The "scrape" bugfix lead to partly damaged encodings. This is fixed now
 2015-01-04 18:01:11 +01:00
Michael Vogel aa6275356a The function to fetch the original url (without shortener) failed if a linked file was too large. 2015-01-04 15:31:47 +01:00
Michael Vogel cce561708a Replaced $argv and $argc with the $_SERVER array 2015-01-04 13:24:16 +01:00
Michael Vogel a86c143e24 The "scrape" bugfix lead to partly damaged encodings. This is fixed now. 2015-01-04 11:56:41 +01:00
fabrixxm 3195bacd9e Merge pull request #1275 from annando/1501-hashtags-in-attachments 
Titles in attached link description now don't create misformatted text anymore
 2015-01-03 21:32:55 +01:00
Tobias Diekershoff 379b161bbb Merge pull request #1277 from annando/1501-bugfix-remote-self 
Items that were stored via "remote-self" hadn't contained a valid avatar
 2015-01-02 13:07:14 +01:00
Michael Vogel 47bca7944e Merge pull request #1276 from tobiasd/20150102fr 
FR update to the strings
 2015-01-02 13:06:02 +01:00
Michael Vogel 7156294055 Items that were stored via "remote-self" hadn't contained a valid avatar picture. 2015-01-02 12:45:09 +01:00
Tobias Diekershoff 882f9c83d6 FR update to the strings 2015-01-02 08:26:08 +01:00
Michael Vogel b5beb4c69a Litte typo ... 2015-01-02 07:50:21 +01:00
Michael Vogel bf147ca9d9 Hashtags in attached link description now don't create misformatted text anymore. 2015-01-02 01:43:31 +01:00
Michael Vogel 38a45d325f See issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined. 2015-01-02 00:01:17 +01:00
Tobias Diekershoff 8c8ffdf999 Merge pull request #1273 from annando/issue-920 
Using a better placeholder. See issue 920
 2015-01-01 21:47:48 +01:00
Michael Vogel 1520a3feab Using a better placeholder. Could solve this issue: https://github.com/friendica/friendica/issues/920 2015-01-01 21:19:07 +01:00
Tobias Diekershoff 22ae03c1a3 Merge pull request #1271 from fabrixxm/api/favorites 
api: favorite create/destroy update also thread table
 2015-01-01 19:06:59 +01:00