Michael Vogel
7bfa9b5650
Merge pull request #2547 from rabuzarus/3005-frio_display_fix
...
frio: commented out some js for the color highlight in /display/ beca…
2016-05-30 15:06:16 +02:00
rabuzarus
3948e2923a
frio: commented out some js for the color highlight in /display/ because it causes some errors in ff
2016-05-30 15:01:30 +02:00
Tobias Diekershoff
2d280f55ac
Merge pull request #2544 from annando/issue-1769
...
Issue 1769: Some enhancements for sending wall mails
2016-05-30 14:35:04 +02:00
rabuzarus
f4c0c18b16
Merge pull request #2546 from annando/1605-frio-template-clean
...
frio: Some small template clean up
2016-05-30 08:51:33 +02:00
Michael Vogel
5218667196
Merge remote-tracking branch 'upstream/develop' into 1605-frio-template-clean
2016-05-30 07:24:06 +02:00
Michael Vogel
7e6598f2c0
Adopted the changes to the other themes as well.
2016-05-30 07:18:25 +02:00
Tobias Diekershoff
b2c6bf0078
Merge pull request #2543 from annando/frio-hovercard
...
Frio: Hovercard is now a core function
2016-05-30 06:25:29 +02:00
Michael Vogel
ecb67feca1
Adapting the changes to search_item.tpl as well
2016-05-30 05:21:57 +02:00
Michael Vogel
09931b7124
frio: Some small template clean up
2016-05-29 23:42:22 +02:00
rabuzarus
7beb5795b6
Merge pull request #2545 from annando/1605-frio-separator
...
Frio: The separator dots are enabled again
2016-05-29 23:15:29 +02:00
Michael Vogel
47efc6df63
Frio: The separator dots are enabled again
2016-05-29 23:02:48 +02:00
Michael Vogel
d22d36be7d
Now with correct url
2016-05-29 22:13:08 +02:00
Michael Vogel
e4ec867df3
Better detection for remote user
2016-05-29 22:02:31 +02:00
Michael Vogel
0a617da044
Wall message can now redirect to your own page if you are connected.
2016-05-29 21:29:26 +02:00
Michael Vogel
77f7619720
Issue 1769: Some enhancements for sending wall mails
2016-05-29 19:35:23 +02:00
rabuzarus
d40f32cc55
Merge pull request #2542 from annando/1605-more-frio2
...
Frio: Bugfix for linebreaks in location
2016-05-29 15:59:28 +02:00
Michael Vogel
3d3498af1b
And some more
2016-05-29 15:40:24 +02:00
Michael Vogel
c0ea789786
Some location changes
2016-05-29 15:33:36 +02:00
Michael Vogel
98f7c73d10
Frio: Hovercard is now a core function
2016-05-29 15:28:31 +02:00
Tobias Diekershoff
a3a425f10a
Merge pull request #2541 from annando/1605-photo-upload
...
Sometimes uploaded pictures weren't posted correctly to other networks
2016-05-29 12:20:39 +02:00
Michael Vogel
5580c0d708
Bugfix: Sometimes uploaded pictures weren't posted correctly to other networks
2016-05-29 10:59:06 +02:00
Michael Vogel
036ca6a6e1
frio: Bugfix for linebreak of locations in comments
2016-05-29 10:56:49 +02:00
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
Michael Vogel
05a13a99b2
Frio: Location should look now similar everywhere
2016-05-28 13:47:41 +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
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
