]> git.mxchange.org Git - friendica.git/log
friendica.git
8 years agoThe queries for items are unified (a little bit)
Michael Vogel [Sun, 12 Jun 2016 19:04:55 +0000 (21:04 +0200)]
The queries for items are unified (a little bit)

8 years agoMerge pull request #2584 from rabuzarus/0906-profiles
Michael Vogel [Sun, 12 Jun 2016 12:20:42 +0000 (14:20 +0200)]
Merge pull request #2584 from rabuzarus/0906-profiles

some restructure in profiles.php + frio template for profiles settings

8 years agoMerge pull request #2587 from rabuzarus/1006-short-info
Michael Vogel [Sun, 12 Jun 2016 10:12:43 +0000 (12:12 +0200)]
Merge pull request #2587 from rabuzarus/1006-short-info

frio: a short contact informations will be provided at the second nav…

8 years agoMerge pull request #2594 from rabuzarus/1210-login-tpl
Michael Vogel [Sun, 12 Jun 2016 10:08:54 +0000 (12:08 +0200)]
Merge pull request #2594 from rabuzarus/1210-login-tpl

frio: provide login.tpl

8 years agofrio: provide login.tpl
rabuzarus [Sun, 12 Jun 2016 09:51:43 +0000 (11:51 +0200)]
frio: provide login.tpl

8 years agoMerge pull request #2583 from fabrixxm/frio-login-modal
rabuzarus [Sun, 12 Jun 2016 08:50:56 +0000 (10:50 +0200)]
Merge pull request #2583 from fabrixxm/frio-login-modal

Frio: login button opens a modal

8 years agofrio: closed profile setting sections on page load
rabuzarus [Sat, 11 Jun 2016 16:51:20 +0000 (18:51 +0200)]
frio: closed profile setting sections on page load

8 years agofrio short contact informations - some optical polishing
rabuzarus [Sat, 11 Jun 2016 15:43:02 +0000 (17:43 +0200)]
frio short contact informations - some optical polishing

8 years agoMerge pull request #2590 from rabuzarus/1106_finding_string
Michael Vogel [Sat, 11 Jun 2016 09:53:20 +0000 (11:53 +0200)]
Merge pull request #2590 from rabuzarus/1106_finding_string

unify heading of search results to "results for:"

8 years agoreset gitignore
rabuzarus [Sat, 11 Jun 2016 08:57:45 +0000 (10:57 +0200)]
reset gitignore

8 years agoMerge develop into 1006-short-info
rabuzarus [Sat, 11 Jun 2016 08:52:26 +0000 (10:52 +0200)]
Merge develop into 1006-short-info

Conflicts:
view/theme/frio/js/theme.js

8 years agounify heading of search results to "results for:"
rabuzarus [Sat, 11 Jun 2016 08:44:52 +0000 (10:44 +0200)]
unify heading of search results to "results for:"

8 years agoMerge pull request #2588 from fabrixxm/nginx-sample-docs
Michael Vogel [Sat, 11 Jun 2016 08:27:53 +0000 (10:27 +0200)]
Merge pull request #2588 from fabrixxm/nginx-sample-docs

Move Nginx reverse proxy sample from INSTALL to separate file

8 years agoMerge pull request #2586 from rabuzarus/1006-search
Michael Vogel [Sat, 11 Jun 2016 08:26:20 +0000 (10:26 +0200)]
Merge pull request #2586 from rabuzarus/1006-search

frio: improvements in search behavior

8 years agoMerge pull request #2589 from rabuzarus/1106-admin-clean
Michael Vogel [Sat, 11 Jun 2016 08:21:43 +0000 (10:21 +0200)]
Merge pull request #2589 from rabuzarus/1106-admin-clean

mod/admin.php: some clean up

8 years agomod/admin.php: some clean up
rabuzarus [Sat, 11 Jun 2016 08:12:03 +0000 (10:12 +0200)]
mod/admin.php: some clean up

8 years agouse js/modal.js to show Login page in modal
fabrixxm [Sat, 11 Jun 2016 07:58:26 +0000 (09:58 +0200)]
use js/modal.js to show Login page in modal

8 years agoFrio: make jslint more happy
fabrixxm [Sat, 11 Jun 2016 07:40:50 +0000 (09:40 +0200)]
Frio: make jslint more happy

8 years agoMove Nginx reverse proxy sample from INSTALL to separate file
fabrixxm [Sat, 11 Jun 2016 07:27:00 +0000 (09:27 +0200)]
Move Nginx reverse proxy sample from INSTALL to separate file

8 years agofrio: a short contact informations - better fadeOut handling
rabuzarus [Fri, 10 Jun 2016 23:40:28 +0000 (01:40 +0200)]
frio: a short contact informations - better fadeOut handling

8 years agofrio: a short contact informations - add border-radius to profile picture (this fits...
rabuzarus [Fri, 10 Jun 2016 23:32:29 +0000 (01:32 +0200)]
frio: a short contact informations - add border-radius to profile picture (this fits better to the rest of the profile pictures)

8 years agofrio: a short contact informations will be provided at the second nav bar by scrollin...
rabuzarus [Fri, 10 Jun 2016 23:28:25 +0000 (01:28 +0200)]
frio: a short contact informations will be provided at the second nav bar by scrolling down (on pages where vcard is available)

8 years agofrio: improvements in search behavior
rabuzarus [Fri, 10 Jun 2016 18:34:25 +0000 (20:34 +0200)]
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

8 years agoMerge pull request #2585 from fabrixxm/update_config_classes
rabuzarus [Fri, 10 Jun 2016 11:35:00 +0000 (13:35 +0200)]
Merge pull request #2585 from fabrixxm/update_config_classes

Update config classes

8 years agoAdd `$default_value` parameter to `Config::get()` and `PConfig::get()`
Fabrixxm [Fri, 10 Jun 2016 10:00:34 +0000 (12:00 +0200)]
Add `$default_value` parameter to `Config::get()` and `PConfig::get()`

8 years agoMove `Config` and `PConfig` classes in `\Friendica\Core namespace`
Fabrixxm [Fri, 10 Jun 2016 09:52:01 +0000 (11:52 +0200)]
Move `Config` and `PConfig` classes in `\Friendica\Core namespace`

8 years agoset include/ folder base for 'Friendica' PSR4 namespace
Fabrixxm [Fri, 10 Jun 2016 09:50:52 +0000 (11:50 +0200)]
set include/ folder base for 'Friendica' PSR4 namespace

8 years agofrio + core: forgot to delete a comment
rabuzarus [Fri, 10 Jun 2016 09:29:23 +0000 (11:29 +0200)]
frio + core: forgot to delete a comment

8 years agofrio + core: some restructure in profiles.php + frio template for profiles settings
rabuzarus [Fri, 10 Jun 2016 09:24:38 +0000 (11:24 +0200)]
frio + core: some restructure in profiles.php + frio template for profiles settings

8 years agoMerge pull request #2576 from rabuzarus/0806-PConfig
fabrixxm [Fri, 10 Jun 2016 09:13:08 +0000 (11:13 +0200)]
Merge pull request #2576 from rabuzarus/0806-PConfig

move config to its own class (with legacy support)

8 years agoFrio: login button opens a modal
Fabrixxm [Fri, 10 Jun 2016 08:40:13 +0000 (10:40 +0200)]
Frio: login button opens a modal

8 years agoMerge pull request #2582 from annando/1606-more-avatar-stuff
Tobias Diekershoff [Fri, 10 Jun 2016 07:39:01 +0000 (09:39 +0200)]
Merge pull request #2582 from annando/1606-more-avatar-stuff

Some more places where the avatar picture is taken from the database

8 years agoMerge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop
fabrixxm [Fri, 10 Jun 2016 06:36:11 +0000 (08:36 +0200)]
Merge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop

Enable SSL on standard and well-known HTTP headers

8 years agoSome more places where the avatar picture is taken from the database
Michael Vogel [Fri, 10 Jun 2016 05:44:32 +0000 (07:44 +0200)]
Some more places where the avatar picture is taken from the database

8 years agoMerge pull request #2581 from tobiasd/adm-workerqueue
Michael Vogel [Thu, 9 Jun 2016 22:03:37 +0000 (00:03 +0200)]
Merge pull request #2581 from tobiasd/adm-workerqueue

show the workerqueue in the admin panel summary

8 years agoMerge pull request #2579 from rabuzarus/0806-content-experimental
Michael Vogel [Thu, 9 Jun 2016 22:01:33 +0000 (00:01 +0200)]
Merge pull request #2579 from rabuzarus/0806-content-experimental

content: make experimental mod/content.php work again

8 years agoshow the workerqueue in the admin panel summary
Tobias Diekershoff [Thu, 9 Jun 2016 16:08:40 +0000 (18:08 +0200)]
show the workerqueue in the admin panel summary

8 years agoMerge pull request #2580 from rabuzarus/0906-search-strings
fabrixxm [Thu, 9 Jun 2016 12:47:05 +0000 (14:47 +0200)]
Merge pull request #2580 from rabuzarus/0906-search-strings

Renamed "Search results for:" in "Results for:" to have more space on…

8 years agoRenamed "Nickname or Email address:" in "Nickname or Email"
rabuzarus [Thu, 9 Jun 2016 11:12:39 +0000 (13:12 +0200)]
Renamed "Nickname or Email address:" in "Nickname or Email"

8 years agoRenamed "Search results for:" in "Results for:" to have more space on mobile
rabuzarus [Thu, 9 Jun 2016 11:06:21 +0000 (13:06 +0200)]
Renamed "Search results for:" in "Results for:" to have more space on mobile

8 years agoMerge pull request #2578 from annando/1606-bugfix-contact
rabuzarus [Thu, 9 Jun 2016 00:18:54 +0000 (02:18 +0200)]
Merge pull request #2578 from annando/1606-bugfix-contact

Bugfix: In threads the contact data from users weren't taken.

8 years agocontent.php: remove load_contact_links()
rabuzarus [Wed, 8 Jun 2016 23:39:45 +0000 (01:39 +0200)]
content.php: remove load_contact_links()

8 years agocontent: make experimental mod/content.php work again
rabuzarus [Wed, 8 Jun 2016 23:35:57 +0000 (01:35 +0200)]
content: make experimental mod/content.php work again

8 years agoMerge pull request #2577 from rabuzarus/0806-frio-html-cache
Michael Vogel [Wed, 8 Jun 2016 20:56:47 +0000 (22:56 +0200)]
Merge pull request #2577 from rabuzarus/0806-frio-html-cache

frio: improvements in js jot behavior

8 years agoBugfix: In threads the contact data from users weren't taken.
Michael Vogel [Wed, 8 Jun 2016 20:50:57 +0000 (22:50 +0200)]
Bugfix: In threads the contact data from users weren't taken.

8 years agoconfig && pconfig: return NULL if config is unset
rabuzarus [Wed, 8 Jun 2016 19:52:10 +0000 (21:52 +0200)]
config && pconfig: return NULL if config is unset

8 years agofrio: improvements it js jot behavior
rabuzarus [Wed, 8 Jun 2016 18:53:01 +0000 (20:53 +0200)]
frio: improvements it js jot behavior
- cache the original jot everytime (to restore it after modal close)
- possibility to edit event items

8 years agomove config to its own class (with legacy support)
rabuzarus [Wed, 8 Jun 2016 09:02:18 +0000 (11:02 +0200)]
move config to its own class (with legacy support)

8 years agoMerge pull request #2575 from annando/1606-shared-template
Tobias Diekershoff [Wed, 8 Jun 2016 07:54:54 +0000 (09:54 +0200)]
Merge pull request #2575 from annando/1606-shared-template

New template for shared content instead of hardcoded stuff in source

8 years agoRenamed template
Michael Vogel [Wed, 8 Jun 2016 05:11:16 +0000 (07:11 +0200)]
Renamed template

8 years agoMerge remote-tracking branch 'upstream/develop' into 1606-shared-template
Michael Vogel [Tue, 7 Jun 2016 20:40:29 +0000 (22:40 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-shared-template

8 years agoMerge pull request #2574 from rabuzarus/0607-saved-search
Michael Vogel [Tue, 7 Jun 2016 20:38:50 +0000 (22:38 +0200)]
Merge pull request #2574 from rabuzarus/0607-saved-search

provide a general content wrapper + frio saved searches

8 years agoNew template for shared content instead of hardcoded stuff in source
Michael Vogel [Tue, 7 Jun 2016 20:29:50 +0000 (22:29 +0200)]
New template for shared content instead of hardcoded stuff in source

8 years agocontent_wrapper.tpl respects content with no title
rabuzarus [Tue, 7 Jun 2016 14:38:22 +0000 (16:38 +0200)]
content_wrapper.tpl respects content with no title

8 years agoprofice a general content wrapper template.
rabuzarus [Tue, 7 Jun 2016 14:32:02 +0000 (16:32 +0200)]
profice a general content wrapper template.

8 years agofrio: saved_searches_aside & searchbox template
rabuzarus [Tue, 7 Jun 2016 13:29:38 +0000 (15:29 +0200)]
frio: saved_searches_aside & searchbox template

8 years agoMerge pull request #2573 from rabuzarus/0606-more-hovercard
Tobias Diekershoff [Tue, 7 Jun 2016 09:32:56 +0000 (11:32 +0200)]
Merge pull request #2573 from rabuzarus/0606-more-hovercard

frio: some hover-card css fixes

8 years agofrio: some hover card css fixes (enable on mouseleave again - forgot it)
rabuzarus [Tue, 7 Jun 2016 08:16:31 +0000 (10:16 +0200)]
frio: some hover card css fixes (enable on mouseleave again - forgot it)

8 years agofrio: some hover card css fixes
rabuzarus [Tue, 7 Jun 2016 08:13:08 +0000 (10:13 +0200)]
frio: some hover card css fixes

8 years agoMerge pull request #2569 from tobiasd/doc-settings-de
Michael Vogel [Tue, 7 Jun 2016 05:57:29 +0000 (07:57 +0200)]
Merge pull request #2569 from tobiasd/doc-settings-de

German translation of doc/Settings

8 years agoMerge pull request #2570 from annando/1606-database
Tobias Diekershoff [Tue, 7 Jun 2016 05:29:01 +0000 (07:29 +0200)]
Merge pull request #2570 from annando/1606-database

Some optimized sql queries

8 years agoTypos
Tobias Diekershoff [Tue, 7 Jun 2016 04:53:37 +0000 (06:53 +0200)]
Typos

8 years agoMerge remote-tracking branch 'upstream/develop' into 1606-database
Michael Vogel [Tue, 7 Jun 2016 04:12:28 +0000 (06:12 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-database

8 years agoMerge pull request #2572 from rabuzarus/0606-more-hovercard
Michael Vogel [Tue, 7 Jun 2016 04:10:46 +0000 (06:10 +0200)]
Merge pull request #2572 from rabuzarus/0606-more-hovercard

frio: fix close hovercard on mousleave

8 years agoMerge pull request #2571 from rabuzarus/0706-widgets
Michael Vogel [Tue, 7 Jun 2016 04:10:05 +0000 (06:10 +0200)]
Merge pull request #2571 from rabuzarus/0706-widgets

frio: some more widget templates

8 years agofrio: fix close hovercard on mousleave
rabuzarus [Mon, 6 Jun 2016 23:42:01 +0000 (01:42 +0200)]
frio: fix close hovercard on mousleave

8 years agofrio: add group_side widget template
rabuzarus [Mon, 6 Jun 2016 23:28:38 +0000 (01:28 +0200)]
frio: add group_side widget template

8 years agofrio: follow & peoplefind widget template
rabuzarus [Mon, 6 Jun 2016 22:38:39 +0000 (00:38 +0200)]
frio: follow & peoplefind widget template

8 years agoSome optimized sql queries
Michael Vogel [Mon, 6 Jun 2016 20:57:27 +0000 (22:57 +0200)]
Some optimized sql queries

8 years agoGerman translation of doc/Settings, part of #2194
Tobias Diekershoff [Mon, 6 Jun 2016 20:17:40 +0000 (22:17 +0200)]
German translation of doc/Settings, part of #2194

8 years agoMerge pull request #2568 from annando/1606-process2
Tobias Diekershoff [Mon, 6 Jun 2016 19:48:59 +0000 (21:48 +0200)]
Merge pull request #2568 from annando/1606-process2

"system unavailable" when the maximum number of processes is reached

8 years agoMerge pull request #2567 from rabuzarus/0606-photo-menu
Michael Vogel [Mon, 6 Jun 2016 19:28:25 +0000 (21:28 +0200)]
Merge pull request #2567 from rabuzarus/0606-photo-menu

photo_menu: now the photo_menu does have at all places the same struc…

8 years agoExit with "system unavailable" when the maximum number of processes is reached
Michael Vogel [Mon, 6 Jun 2016 19:22:54 +0000 (21:22 +0200)]
Exit with "system unavailable" when the maximum number of processes is reached

8 years agoMerge pull request #2565 from rabuzarus/0606-confic-docu
Tobias Diekershoff [Mon, 6 Jun 2016 16:31:37 +0000 (18:31 +0200)]
Merge pull request #2565 from rabuzarus/0606-confic-docu

move pconfig to its own class

8 years agoMerge pull request #2566 from rabuzarus/0606-more-hovercard
Tobias Diekershoff [Mon, 6 Jun 2016 16:29:34 +0000 (18:29 +0200)]
Merge pull request #2566 from rabuzarus/0606-more-hovercard

frio: extend hover card to wall-item-responses (likes, attendend) and …

8 years agoMerge pull request #2561 from annando/1606-dbm
Tobias Diekershoff [Mon, 6 Jun 2016 16:11:39 +0000 (18:11 +0200)]
Merge pull request #2561 from annando/1606-dbm

Check the maximum number of database processes

8 years agophoto_menu: now the photo_menu does have at all places the same structure
rabuzarus [Mon, 6 Jun 2016 14:54:29 +0000 (16:54 +0200)]
photo_menu: now the photo_menu does have at all places the same structure

8 years agofrio: extend hovercard to wall-item-responses (likes, attendend) and wall-item-bottom...
rabuzarus [Mon, 6 Jun 2016 09:05:29 +0000 (11:05 +0200)]
frio: extend hovercard to wall-item-responses (likes, attendend) and wall-item-bottom mentions

8 years agorename PConfig::del to PConfig:delete
rabuzarus [Mon, 6 Jun 2016 08:46:33 +0000 (10:46 +0200)]
rename PConfig::del to PConfig:delete

8 years agomove pconfig to it's own class PConfig
rabuzarus [Mon, 6 Jun 2016 08:22:14 +0000 (10:22 +0200)]
move pconfig to it's own class PConfig

8 years agoadd doxygen to config functions
rabuzarus [Mon, 6 Jun 2016 08:01:14 +0000 (10:01 +0200)]
add doxygen to config functions

8 years agoAdded documentation
Michael Vogel [Mon, 6 Jun 2016 04:29:03 +0000 (06:29 +0200)]
Added documentation

8 years agoMerge remote-tracking branch 'upstream/develop' into 1606-dbm
Michael Vogel [Mon, 6 Jun 2016 04:21:36 +0000 (06:21 +0200)]
Merge remote-tracking branch 'upstream/develop' into 1606-dbm

8 years agoMerge pull request #2563 from rabuzarus/0506-contact-transition
Tobias Diekershoff [Mon, 6 Jun 2016 04:07:09 +0000 (06:07 +0200)]
Merge pull request #2563 from rabuzarus/0506-contact-transition

frio: give the contact actions a little transition effect

8 years agoMerge pull request #2564 from annando/1606-contact-handling
Tobias Diekershoff [Mon, 6 Jun 2016 04:06:21 +0000 (06:06 +0200)]
Merge pull request #2564 from annando/1606-contact-handling

Fix for mismatching avatars

8 years agoThe local contact search now uses local data if present
Michael Vogel [Sun, 5 Jun 2016 20:21:34 +0000 (22:21 +0200)]
The local contact search now uses local data if present

8 years agoBaseurl removed
Michael Vogel [Sun, 5 Jun 2016 19:22:14 +0000 (21:22 +0200)]
Baseurl removed

8 years agoFetching of profile data improved
Michael Vogel [Sun, 5 Jun 2016 19:17:55 +0000 (21:17 +0200)]
Fetching of profile data improved

8 years agoSome more cleanup and code removal.
Michael Vogel [Sun, 5 Jun 2016 18:01:38 +0000 (20:01 +0200)]
Some more cleanup and code removal.

8 years agofrio: remove legacy transition css
rabuzarus [Sun, 5 Jun 2016 15:12:13 +0000 (17:12 +0200)]
frio: remove legacy transition css

8 years agoSome better handling of "bd" and "birthday"
Michael Vogel [Sun, 5 Jun 2016 13:09:40 +0000 (15:09 +0200)]
Some better handling of "bd" and "birthday"

8 years ago"bd" now always shows the upcoming birthday
Michael Vogel [Sun, 5 Jun 2016 13:03:04 +0000 (15:03 +0200)]
"bd" now always shows the upcoming birthday

8 years agoUnified contact data handling
Michael Vogel [Sun, 5 Jun 2016 11:57:11 +0000 (13:57 +0200)]
Unified contact data handling

8 years agofrio: give the contact actions a little transition effect
rabuzarus [Sun, 5 Jun 2016 07:56:53 +0000 (09:56 +0200)]
frio: give the contact actions a little transition effect

8 years agoMerge pull request #2562 from friendica/fabrixxm-patch-1
Tobias Diekershoff [Sat, 4 Jun 2016 17:40:46 +0000 (19:40 +0200)]
Merge pull request #2562 from friendica/fabrixxm-patch-1

Wild "+" in js/main.js

8 years agoWild "+" in js/main.js
fabrixxm [Sat, 4 Jun 2016 16:44:20 +0000 (18:44 +0200)]
Wild "+" in js/main.js

8 years agoremoved some copy&paste fragments
Michael Vogel [Sat, 4 Jun 2016 10:30:24 +0000 (12:30 +0200)]
removed some copy&paste fragments

8 years agoAdded documentation
Michael Vogel [Sat, 4 Jun 2016 10:23:12 +0000 (12:23 +0200)]
Added documentation

8 years agoremoved duplicated functions
Michael Vogel [Sat, 4 Jun 2016 10:20:09 +0000 (12:20 +0200)]
removed duplicated functions

8 years agoConfigurable amount of maximum processes
Michael Vogel [Sat, 4 Jun 2016 09:04:26 +0000 (11:04 +0200)]
Configurable amount of maximum processes