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

14398 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rabuzarus 497df57ef7 more standards work 2017-03-18 04:41:54 +01:00
rabuzarus e1d22ef5d4 some code cleanup 2017-03-17 19:10:48 +01:00
rabuzarus c785eb29c6 more work on standards compliance 2017-03-17 17:57:57 +01:00
rabuzarus 8ae8465d48 add dop event & fix event edit 2017-03-16 20:15:25 +01:00
rabuzarus 6fdc219143 Merge pull request #3227 from annando/1703-pdo 
We now support PDO
 2017-03-16 00:25:16 +01:00
rabuzarus b4bad92657 Merge pull request #3239 from Hypolite/issue/#3194-2 
Fix wrong deferred function name
 2017-03-15 19:53:16 +01:00
Hypolite Petovan 35ba3cce70 Fix wrong deferred function name 2017-03-15 14:42:34 -04:00
rabuzarus b8e8c96386 Merge pull request #3236 from annando/bugfix-feed 
Bugfix for pull request 3216: Feed items were mixed
 2017-03-15 12:18:49 +01:00
Michael dc3fcf0487 Standard stuff 2017-03-15 06:00:22 +00:00
Michael 35ec1c8f26 Bugfix for pull request 3216 - feed items were mixed 2017-03-14 21:14:09 +00:00
Michael 187a81f159 Merge remote-tracking branch 'upstream/develop' into develop 2017-03-14 21:13:02 +00:00
Michael Vogel e57bd5fe55 Merge pull request #3233 from rabuzarus/20170314_-_pagination 
limit pagination page buttons to  max 10
 2017-03-14 20:05:29 +01:00
rabuzarus 0143369e54 limit pagination page buttons to max 10 2017-03-14 18:31:03 +01:00
Michael Vogel a7e8e86800 Merge pull request #3221 from strk/remember-openid 
Fix "remember me" cookie for OpenID logins
 2017-03-14 16:30:15 +01:00
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 Vogel 199bba20d9 Merge pull request #3200 from Hypolite/issue/#3195 
Improve pagination on frio
 2017-03-14 06:05:42 +01: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
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
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
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
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 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 e10339a47f Merge remote-tracking branch 'upstream/develop' into 1703-pdo 2017-03-12 21:05:10 +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
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
Tobias Diekershoff 2bfa870c47 Friendica Version 3.5.1 2017-03-12 14:38:01 +01:00
Hypolite Petovan 2310bf994a Normalize line endings instead of adding <br> before Markdown() 2017-03-12 03:55:22 -04:00
Sandro Santilli df6304cc42 Fix "remember me" cookie for OpenID logins 
Closes #2432

NOTE: in order to obtain the same "cookie hash" it was required
to include unneeded fields in the user record structure, this would
be good to change in the future...
 2017-03-12 01:11:35 +01:00
Hypolite Petovan 3fa4605ace Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-09 21:11:14 -05:00
fabrixxm 3f6fd8ee69 Merge pull request #3208 from Hypolite/issue/#3194 
Strip @hubzilla.server part from guid for autoscrolling purpuses
 2017-03-09 09:37:21 +01:00
Michael 2d2a35af73 Make Hypolite happy 2017-03-08 18:03:41 +00:00
Hypolite Petovan 37b15995d8 Add pump.io network to probing supported networks 
- Remove useless condition
 2017-03-07 16:43:22 -05:00