Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
14582 commits 2 branches 0 tags 132 MiB
Commit graph

14582 commits

This branch
This branch
All branches
Author SHA1 Message Date
rabuzarus 3061a37b4f Merge pull request #3232 from Hypolite/issue/#3194-2 
frio: Revert guid truncation for scrollToItem() and improve dropItem()
 2017-03-14 13:04:47 +01:00
fabrixxm fa3490ba5b Merge pull request #3224 from annando/1702-no-old_pager 
The old pager is now removed
 2017-03-14 10:29:03 +01:00
Michael 43ceb72196 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-14 07:26:15 +00:00
Michael Vogel 199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195 
Improve pagination on frio
 2017-03-14 06:05:42 +01:00
Michael 748caa0807 Removed debug output 2017-03-14 04:58:05 +00:00
Michael a2b7b2a968 Daily updating the server status 2017-03-13 22:16:09 +00:00
Sandro Santilli 0b46a5f935 Standards: add braces 
(thanks @Hypolite)
 2017-03-13 23:09:09 +01:00
Sandro Santilli 8517ba1fab Remove extra space after open parentheses 2017-03-13 23:08:03 +01:00
Michael Vogel 98945eb6fa Merge pull request #3213 from Hypolite/issue/#2792-2 
Like behavior fix/improvements
 2017-03-13 18:35:32 +01:00
Michael eaf93dc041 I guess, @Hypolite will still find something to change ... 2017-03-13 17:23:02 +00:00
Michael 0dbc72c4ea Embrace the braces and spaces ... 2017-03-13 16:18:45 +00:00
Hypolite Petovan 327b00117d Improve dropItem() functionality 
- Drop the obsolete `#` char
- Add error case when deleting item
- Add item drop support to search items
- Add doc
 2017-03-13 12:12:13 -04:00
Hypolite Petovan f2a0c9fad1 Fix scrollToItem breaking dropItem functionality 
- Add doc
- Refactor function by removing double jQuery wrapping
 2017-03-13 12:10:03 -04:00
Hypolite Petovan 054f43a332 Merge remote-tracking branch 'friendica/develop' into develop 2017-03-13 11:53:34 -04:00
Michael d2bad13e83 Added documentation 2017-03-13 14:57:11 +00:00
Michael ae64f6f7e2 z_fetch_url now always returns an array 2017-03-13 14:37:51 +00:00
Michael 0cb3dc92d3 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 14:10:28 +00:00
rabuzarus e1eb9231f4 Merge pull request #3202 from Hypolite/issue/#3107 
Delete frio obsolete Colors.php library
 2017-03-13 14:17:37 +01:00
Sandro Santilli cbaf196f50 Only remove the "remember me" cookie at submitting the auth form 
Fixes loss of remember (Friendica) cookie on switching Managed accounts
 2017-03-13 11:59:05 +01:00
Michael f852f7aac0 Merge branch 'master' of github.com:annando/friendica 2017-03-13 10:21:35 +00:00
Michael 4d30f2b292 Merge remote-tracking branch 'upstream/master' 2017-03-13 10:21:08 +00:00
Michael bb59f105e7 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-13 10:18:56 +00:00
Michael fbb84ee219 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 10:18:29 +00:00
Michael 52a35f9884 Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-13 08:54:27 +00:00
Michael 611cbcfd06 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-13 08:53:57 +00:00
Michael 83e5c31d28 Merge remote-tracking branch 'upstream/develop' into 1701-poco 2017-03-13 08:49:33 +00:00
Tobias Diekershoff dfc5dc2e9e Merge pull request #3223 from annando/1702-no-language 
The language string isn't displayed anymore
 2017-03-13 08:26:43 +01:00
Michael 6a16565642 Merge remote-tracking branch 'upstream/develop' into 1701-poco 2017-03-13 07:23:32 +00:00
Tobias Diekershoff e2c515baa9 Merge pull request #3225 from annando/1702-no_old_share 
The old share option is removed
 2017-03-13 07:52:38 +01:00
Michael 44888590e5 One error, one documentation, one brace 2017-03-13 06:32:33 +00:00
Michael acadb8ecdb Remove redundancies. 2017-03-13 06:09:00 +00:00
Michael eb6a6228f7 more spaces 2017-03-13 05:57:37 +00:00
Michael 80e58964ce Standard stuff 2017-03-13 00:09:32 +00:00
Michael 97d3176754 Querying via nodeinfo 2017-03-13 00:03:27 +00:00
Michael d9da10975a Merge branch '1702-detect-server' of github.com:annando/friendica into 1702-detect-server 2017-03-12 22:24:06 +00:00
Michael 49b22de705 Changes from previous pull request applied again 2017-03-12 21:57:09 +00:00
Michael e10339a47f Merge remote-tracking branch 'upstream/develop' into 1703-pdo 2017-03-12 21:05:10 +00:00
Michael 77e8c44016 Merge remote-tracking branch 'upstream/develop' into 1702-only-worker 
Conflicts:
	include/onepoll.php
	include/queue.php
 2017-03-12 21:03:44 +00:00
Michael 1624150db4 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 
Conflicts:
	include/onepoll.php
 2017-03-12 20:54:28 +00:00
Michael 259598e569 Merge remote-tracking branch 'upstream/develop' into 1702-no_old_share 2017-03-12 20:52:48 +00:00
Michael 044e9a6603 Merge remote-tracking branch 'upstream/develop' into 1702-no-old_pager 
Conflicts:
	mod/profile.php
 2017-03-12 20:52:14 +00:00
Michael b6a4a2ec7f Merge remote-tracking branch 'upstream/develop' into 1702-no-language 2017-03-12 20:50:20 +00:00
Michael 18d23ca443 Merge remote-tracking branch 'upstream/develop' into 1702-detect-server 2017-03-12 20:49:48 +00:00
Hypolite Petovan 5718e49e68 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-12 11:19:37 -04:00
Tobias Diekershoff 7d1e54664a Merge pull request #3133 from mexon/mat/cidfix 
Allow cid URLs for images
 2017-03-12 15:44:22 +01:00
Tobias Diekershoff 7275319eb6 Merge pull request #3214 from Hypolite/get_contact-rewrite 
Reformatted get_contact()
 2017-03-12 15:42:17 +01:00
Tobias Diekershoff 1bf089e424 Merge pull request #3216 from annando/1701-performance 
Better network handling, improved structure
 2017-03-12 15:40:56 +01:00
Tobias Diekershoff e29d7f19d1 Merge pull request #3222 from Hypolite/issue/#3220 
Diaspora: Normalize line endings instead of adding <br> before Markdown()
 2017-03-12 15:35:42 +01:00
Tobias Diekershoff 30d82f4391 mark the develop version in the version string 2017-03-12 14:40:08 +01:00
Tobias Diekershoff 4cddb74f27 Merge branch 'master' into develop 2017-03-12 14:39:09 +01:00