Commit graph

3111 commits

Author SHA1 Message Date
rabuzarus
82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha 2016-06-13 10:57:42 +02:00
rabuzarus
869a439466 Merge pull request #2595 from annando/1606-contact-priority
Priority for native networks when searching by contact url
2016-06-13 09:28:54 +02:00
Michael Vogel
c68f28bc77 Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup 2016-06-12 21:07:45 +02:00
Michael Vogel
c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
rabuzarus
b2ba25bd27 fix federation statistics 2016-06-12 19:15:12 +02:00
Michael Vogel
6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
2016-06-12 14:20:42 +02:00
Michael Vogel
c138455c5e Merge remote-tracking branch 'upstream/develop' into 1606-contact-priority 2016-06-12 12:16:24 +02:00
Michael Vogel
aac9caab2d Priority for native networks when searching by contact url 2016-06-12 10:46:15 +02:00
Michael Vogel
5fc0f06786 Merge pull request #2590 from rabuzarus/1106_finding_string
unify heading of search results to "results for:"
2016-06-11 11:53:20 +02:00
rabuzarus
ca269b6329 unify heading of search results to "results for:" 2016-06-11 10:44:52 +02:00
Michael Vogel
d48afb6c1b Merge pull request #2586 from rabuzarus/1006-search
frio: improvements in search behavior
2016-06-11 10:26:20 +02:00
rabuzarus
eafad7145b mod/admin.php: some clean up 2016-06-11 10:12:03 +02:00
rabuzarus
db5438ab1a frio: improvements in search behavior
- search value woll be added to nav search input
- focus on nav search input as main search
- save search button appears in the second navbar if search is available
- search heading appears in the second navbar
- provide a mobile search by pressing the search icon
- dirfind: heading distinguish between people and form search
- some js fixes in theme.js
2016-06-10 20:34:25 +02:00
rabuzarus
e773da9ea2 frio + core: forgot to delete a comment 2016-06-10 11:29:23 +02:00
rabuzarus
3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings 2016-06-10 11:24:38 +02:00
Tobias Diekershoff
ee06d2fa3c Merge pull request #2582 from annando/1606-more-avatar-stuff
Some more places where the avatar picture is taken from the database
2016-06-10 09:39:01 +02:00
Michael Vogel
807fbe173b Some more places where the avatar picture is taken from the database 2016-06-10 07:44:32 +02:00
Michael Vogel
baf68af735 Merge pull request #2581 from tobiasd/adm-workerqueue
show the workerqueue in the admin panel summary
2016-06-10 00:03:37 +02:00
Michael Vogel
c9342ccf1d Merge pull request #2579 from rabuzarus/0806-content-experimental
content: make experimental mod/content.php work again
2016-06-10 00:01:33 +02:00
Tobias Diekershoff
e8d39b290a show the workerqueue in the admin panel summary 2016-06-09 18:08:40 +02:00
rabuzarus
e4ba493a01 Renamed "Search results for:" in "Results for:" to have more space on mobile 2016-06-09 13:06:21 +02:00
rabuzarus
5a48ab5a8c content.php: remove load_contact_links() 2016-06-09 01:39:45 +02:00
rabuzarus
9e5a4b2050 content: make experimental mod/content.php work again 2016-06-09 01:35:57 +02:00
rabuzarus
71b30e0651 profice a general content wrapper template. 2016-06-07 16:32:02 +02:00
Michael Vogel
fc66a86dc5 Some optimized sql queries 2016-06-06 22:57:27 +02:00
rabuzarus
5c52736221 photo_menu: now the photo_menu does have at all places the same structure 2016-06-06 16:54:29 +02:00
Michael Vogel
8fbcba0096 The local contact search now uses local data if present 2016-06-05 22:21:34 +02:00
Michael Vogel
4b640dbd97 Fetching of profile data improved 2016-06-05 21:17:55 +02:00
Michael Vogel
ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +02:00
Michael Vogel
71d3274841 Unified contact data handling 2016-06-05 13:57:11 +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
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
Michael Vogel
98f7c73d10 Frio: Hovercard is now a core function 2016-05-29 15:28:31 +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
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
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
Michael Vogel
06998f13b6 Events: Now with guid. 2016-05-22 18:05:01 +02:00
Fabrixxm
6734aa5c28 Make user table in admin sortable via table headers
new GET param for /admin/user: 'o'
value is db table to order by. values are limited by script.
invalid values are discarded.
preped with '-' to order descending.
show unicode arrows in table headers to visually indicate sorting.
2016-05-16 14:38:00 +02:00
Michael Vogel
6f72bc8d3a Better implementation of "hidewall" 2016-05-06 11:04:21 +02:00
Michael Vogel
de431e185e New function to update the global contact for the user id. 2016-05-05 15:08:05 +02:00
Michael Vogel
3df235e5bd The global contact for server users is now stored directly 2016-05-05 12:02:51 +02:00
Michael Vogel
ed485b9d61 Set "hide" in noscrape 2016-05-04 23:50:31 +02:00
Michael Vogel
8992577bb6 Better handling of hidden profiles 2016-05-04 09:30:55 +02:00
Michael Vogel
26e1c4d458 Avoid SQL errors because of existing entries 2016-05-03 19:20:58 +02:00
Tobias Diekershoff
3d3cde2aed Merge pull request #2497 from annando/1604-local-copy
Copy an item to the local user if it's only available as public copy
2016-05-02 06:07:50 +02:00
Michael Vogel
b677f63e85 Added some more explanation/now copy the whole thread 2016-05-01 09:48:05 +02:00
Michael Vogel
5fc1eebdab Copy an item to the local user if it's only available as public copy 2016-05-01 00:19:24 +02:00
Michael Vogel
8e0b3b28da Bugfix: The message list always showed "x and you" 2016-04-30 14:13:43 +02:00
Tobias Diekershoff
9a79b0c5f2 count from 0 2016-04-27 20:23:06 +02:00