rabuzarus
d39f679230
Merge develop into 1006-short-info
...
Conflicts:
view/theme/frio/js/theme.js
2016-06-11 10:52:26 +02:00
Michael Vogel
212fc203d9
Merge pull request #2588 from fabrixxm/nginx-sample-docs
...
Move Nginx reverse proxy sample from INSTALL to separate file
2016-06-11 10:27:53 +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
Michael Vogel
acb50b343e
Merge pull request #2589 from rabuzarus/1106-admin-clean
...
mod/admin.php: some clean up
2016-06-11 10:21:43 +02:00
rabuzarus
eafad7145b
mod/admin.php: some clean up
2016-06-11 10:12:03 +02:00
fabrixxm
fbb905a5c2
Move Nginx reverse proxy sample from INSTALL to separate file
2016-06-11 09:27:00 +02:00
rabuzarus
70f97a3536
frio: a short contact informations - better fadeOut handling
2016-06-11 01:40:28 +02:00
rabuzarus
3c49a410e5
frio: a short contact informations - add border-radius to profile picture (this fits better to the rest of the profile pictures)
2016-06-11 01:32:29 +02:00
rabuzarus
53fb8b1181
frio: a short contact informations will be provided at the second nav bar by scrolling down (on pages where vcard is available)
2016-06-11 01:28:25 +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
710822dca7
Merge pull request #2585 from fabrixxm/update_config_classes
...
Update config classes
2016-06-10 13:35:00 +02:00
Fabrixxm
136ae34245
Add $default_value parameter to Config::get() and PConfig::get()
2016-06-10 12:00:34 +02:00
Fabrixxm
6c346b1ab6
Move Config and PConfig classes in \Friendica\Core namespace
2016-06-10 11:52:01 +02:00
Fabrixxm
f2e79e976d
set include/ folder base for 'Friendica' PSR4 namespace
2016-06-10 11:50:52 +02:00
fabrixxm
60c1172e7e
Merge pull request #2576 from rabuzarus/0806-PConfig
...
move config to its own class (with legacy support)
2016-06-10 11:13:08 +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
fabrixxm
0f8148a4cb
Merge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop
...
Enable SSL on standard and well-known HTTP headers
2016-06-10 08:36:11 +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
fabrixxm
89f4d9f164
Merge pull request #2580 from rabuzarus/0906-search-strings
...
Renamed "Search results for:" in "Results for:" to have more space on…
2016-06-09 14:47:05 +02:00
rabuzarus
15959d7767
Renamed "Nickname or Email address:" in "Nickname or Email"
2016-06-09 13:12:39 +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
30056dd22d
Merge pull request #2578 from annando/1606-bugfix-contact
...
Bugfix: In threads the contact data from users weren't taken.
2016-06-09 02:18:54 +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
Michael Vogel
871fa4c777
Merge pull request #2577 from rabuzarus/0806-frio-html-cache
...
frio: improvements in js jot behavior
2016-06-08 22:56:47 +02:00
Michael Vogel
098a8ac6c2
Bugfix: In threads the contact data from users weren't taken.
2016-06-08 22:50:57 +02:00
rabuzarus
023c43fa4a
config && pconfig: return NULL if config is unset
2016-06-08 21:52:10 +02:00
rabuzarus
f79a7bc455
frio: improvements it js jot behavior
...
- cache the original jot everytime (to restore it after modal close)
- possibility to edit event items
2016-06-08 20:53:01 +02:00
rabuzarus
7e8ea1cb87
move config to its own class (with legacy support)
2016-06-08 11:02:18 +02:00
Tobias Diekershoff
17f362f4f6
Merge pull request #2575 from annando/1606-shared-template
...
New template for shared content instead of hardcoded stuff in source
2016-06-08 09:54:54 +02:00
Michael Vogel
aad00ddc04
Renamed template
2016-06-08 07:11:16 +02:00
Michael Vogel
f59b21d4a8
Merge remote-tracking branch 'upstream/develop' into 1606-shared-template
2016-06-07 22:40:29 +02:00
Michael Vogel
d034822f07
Merge pull request #2574 from rabuzarus/0607-saved-search
...
provide a general content wrapper + frio saved searches
2016-06-07 22:38:50 +02:00
Michael Vogel
e2e32eecac
New template for shared content instead of hardcoded stuff in source
2016-06-07 22:29:50 +02:00
rabuzarus
26336a60e9
content_wrapper.tpl respects content with no title
2016-06-07 16:38:22 +02:00
rabuzarus
71b30e0651
profice a general content wrapper template.
2016-06-07 16:32:02 +02:00
rabuzarus
3a368214c0
frio: saved_searches_aside & searchbox template
2016-06-07 15:29:38 +02:00
Tobias Diekershoff
03c09e4c3f
Merge pull request #2573 from rabuzarus/0606-more-hovercard
...
frio: some hover-card css fixes
2016-06-07 11:32:56 +02:00
rabuzarus
60ca6b7f07
frio: some hover card css fixes (enable on mouseleave again - forgot it)
2016-06-07 10:16:31 +02:00
rabuzarus
d570a90c05
frio: some hover card css fixes
2016-06-07 10:13:08 +02:00
Michael Vogel
1dd77ee443
Merge pull request #2569 from tobiasd/doc-settings-de
...
German translation of doc/Settings
2016-06-07 07:57:29 +02:00
Tobias Diekershoff
68286910a3
Merge pull request #2570 from annando/1606-database
...
Some optimized sql queries
2016-06-07 07:29:01 +02:00
Tobias Diekershoff
04594666dc
Typos
2016-06-07 06:53:37 +02:00
Michael Vogel
c7ab2d2482
Merge remote-tracking branch 'upstream/develop' into 1606-database
2016-06-07 06:12:28 +02:00
Michael Vogel
bd01a1c63a
Merge pull request #2572 from rabuzarus/0606-more-hovercard
...
frio: fix close hovercard on mousleave
2016-06-07 06:10:46 +02:00
Michael Vogel
69695608ba
Merge pull request #2571 from rabuzarus/0706-widgets
...
frio: some more widget templates
2016-06-07 06:10:05 +02:00
rabuzarus
d752ea9abc
frio: fix close hovercard on mousleave
2016-06-07 01:42:01 +02:00
