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

12114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel db99ce9512 Merge pull request #2538 from rabuzarus/2805_frio_mobile 
frio: open hovercard on click if device is a mobile device
 2016-05-28 13:49:05 +02:00
rabuzarus 9285ba8178 Merge pull request #2536 from annando/1605-more-frio 
Frio: Like, Dislike and comment are having icons, links are underlined
 2016-05-28 13:38:55 +02:00
Michael Vogel 4a388e84af Frio: Adopt changes to search_item.tpl as well. 2016-05-28 13:08:43 +02:00
rabuzarus 9dc4420561 frio: open hovercard on click if device is a mobile device 2016-05-28 13:07:24 +02:00
Michael Vogel 79517cb7d2 Merge pull request #2534 from fabrixxm/frio-smallfixes 
Small fixes to Frio theme
 2016-05-28 10:08:25 +02:00
Michael Vogel add258ac08 Frio: Like, Dislike and comment are having icons, links are underlined 2016-05-28 09:57:19 +02:00
rabuzarus 013a3b81ed Merge pull request #2535 from annando/1605-frio-notif-cursor 
Frio: When hovering over the notification entries the cursor is now a pointer
 2016-05-27 21:07:40 +02:00
Michael Vogel d91052f73a Frio: When hovering over the notification entries the cursor is now a pointer 2016-05-27 20:33:29 +02:00
fabrixxm e568020718 Frio: remove header(location) in default.php 
The call to header() is too late in code (output was already sent)
 2016-05-27 15:53:11 +02:00
fabrixxm 6fcad290a4 Frio: Fix warnings in config page 2016-05-27 15:50:51 +02:00
Tobias Diekershoff 8bcf52d180 Merge pull request #2532 from annando/1605-attachment-encoding 
Bugfix: Some more encoding problems with attachments fixed
 2016-05-27 07:22:53 +02:00
rabuzarus 15fb0339ac Merge pull request #2533 from annando/1605-frio-link 
Frio: Added a link to the thread on the same server
 2016-05-27 01:51:50 +02:00
Michael Vogel 2d6740c340 Frio: Added a link to the thread on the same server 2016-05-26 23:23:24 +02:00
Michael Vogel eca1b1ff58 Bugfix: Some more encoding problems with attachments fixed 2016-05-26 23:22:30 +02:00
fabrixxm 2a33882fe0 Merge pull request #2531 from rabuzarus/frio_merge 
adding the experimental frio theme to friendica repo
 2016-05-26 11:35:22 +02:00
Michael Vogel de58b858ea Merge pull request #2530 from strk/openid 
Fix OpenID login
 2016-05-26 07:36:02 +02:00
Michael Vogel 9f0aacecd1 Merge pull request #2522 from tobiasd/doc-settings2 
clearing up the admin panel documentation
 2016-05-26 07:25:53 +02:00
Sandro Santilli 10e6a243ea Simplify openid query, and (needlessly) quote all fields 
Fields quoting was requested by rabuzarus
 2016-05-25 16:06:16 +02:00
rabuzarus 8ec4243253 Merge branch 'master' of ../save/merge/frio into frio_merge 2016-05-25 15:14:09 +02:00
rabuzarus b67378ac69 restructuring for PR for friendica main repo 2016-05-25 15:12:29 +02:00
Sandro Santilli b7bc428630 Fix OpenID login 
The problem was that while openid was stored not-normalized in the database,
the checking code was looking for a normalized form instead.

The commit removing normalization step on saving user preferences
was 8367cad, which might have left old users with normalized openid
and new users with non-normalized one.

This commit makes the checking code look for both normalized and not
normalized form, to be backward compatible.
 2016-05-25 12:50:09 +02:00
rabuzarus 045096b023 README: Add link to commit history 2016-05-25 08:45:15 +02:00
rabuzarus 2af6575466 mark frio theme as experimental 2016-05-25 08:24:07 +02:00
root 3c402b6a6c Remove debug log 2016-05-24 22:37:40 +02:00
root 7fbb51adb9 Do not normalize openid url when logging in 
(since it isn't normalized when setting it via user settings)

NOTE: this broke with 8367cad
 2016-05-24 22:36:51 +02:00
Tobias Diekershoff c013ca9d36 Merge pull request #2529 from annando/1605-events 
Issue 2277: Events can now be edited and deleted
 2016-05-23 18:06:09 +02:00
Tobias Diekershoff b727e0d0c0 Merge pull request #2523 from annando/1605-bugfix-notificatoon 
Bugfix: Under certain circumstances notifications were send
 2016-05-23 16:57:23 +02:00
Tobias Diekershoff 177fbd2a7c small fixes 2016-05-23 14:05:27 +02:00
Tobias Diekershoff 3df9876d74 remote_self 2016-05-23 09:05:49 +02:00
Tobias Diekershoff 8e89ba7a42 placement of the logfiles 2016-05-23 09:03:57 +02:00
Michael Vogel 39ce023158 Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon 2016-05-23 06:49:31 +02:00
Tobias Diekershoff 1383c73c8d Merge pull request #2527 from annando/1605-entities-link 
Bugfix: The url in attachments had problems with entities
 2016-05-23 06:13:29 +02:00
Tobias Diekershoff f43b96e079 Merge pull request #2526 from annando/issue-2063 
Issue 2063: Define the constant SIGTERM if not defined
 2016-05-23 06:11:17 +02:00
Michael Vogel b9e702742c Remove some test logging 2016-05-22 18:22:05 +02:00
Michael Vogel b7f2858486 Issue 2277: changes to events are now distributed. 2016-05-22 18:16:47 +02:00
Michael Vogel 06998f13b6 Events: Now with guid. 2016-05-22 18:05:01 +02:00
Michael Vogel 36063b47ab Bugfix: The url in attachments had problems with entities 2016-05-22 13:46:05 +02:00
Michael Vogel 22676f7e21 Issue 2063: Define the constant SIGTERM if not defined 2016-05-22 12:31:32 +02:00
Michael Vogel a1691664f3 Bugfix: Under certain circumstances notifications were send 2016-05-21 13:19:30 +02:00
Tobias Diekershoff 0a5f70acb9 Typo 2016-05-21 06:02:36 +02:00
Tobias Diekershoff aedbbdc0bf added short intoduction of the term admin panel 2016-05-20 20:09:45 +02:00
Tobias Diekershoff 0d6b49977b rewrite of the doc/settings.md 2016-05-20 20:06:37 +02:00
rabuzarus bd184d14eb private messages: fix 2 - contact photos aren't visible 2016-05-20 03:49:53 +02:00
rabuzarus 6dbc5fb348 private messages: fix - contact photos aren't visible 2016-05-20 03:45:50 +02:00
rabuzarus 57465b2cf8 private messages: some work for the standard messages overview 2016-05-20 03:40:53 +02:00
rabuzarus 625d107550 ohh some spelling mistakes heading is written only with one d :-) 2016-05-20 01:50:56 +02:00
rabuzarus 1e36de54d5 private mail: insert some space between conversation and textarea 2016-05-20 01:46:33 +02:00
Michael Vogel 3ba026b501 Merge pull request #2521 from tobiasd/20160519-de 
DE translation THX Abrax
 2016-05-19 12:19:57 +02:00
Tobias Diekershoff cf5ca15711 DE translation THX Abrax 2016-05-19 12:01:38 +02:00
Michael Vogel 760e3486d8 Merge pull request #2519 from tobiasd/20160519-messagespo 
regenerated master messages.po file
 2016-05-19 07:37:31 +02:00