clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles Michael Vogel 2016-06-12 14:20:42 +02:00
  • c138455c5e Merge remote-tracking branch 'upstream/develop' into 1606-contact-priority Michael Vogel 2016-06-12 12:16:24 +02:00
  • 0eb69b963e Merge pull request #2587 from rabuzarus/1006-short-info Michael Vogel 2016-06-12 12:12:43 +02:00
  • 04410a5b76 Merge pull request #2594 from rabuzarus/1210-login-tpl Michael Vogel 2016-06-12 12:08:54 +02:00
  • 09fbcbc685 Just some added todo Michael Vogel 2016-06-12 12:06:15 +02:00
  • 5fc5ef5461 frio: provide login.tpl rabuzarus 2016-06-12 11:51:43 +02:00
  • 3264efb238 Merge pull request #2583 from fabrixxm/frio-login-modal rabuzarus 2016-06-12 10:50:56 +02:00
  • aac9caab2d Priority for native networks when searching by contact url Michael Vogel 2016-06-12 10:46:15 +02:00
  • 56b600381e frio: add some more settings templates rabuzarus 2016-06-12 00:15:48 +02:00
  • f2ad8dd1d4 frio: add settings.tpl rabuzarus 2016-06-11 22:35:08 +02:00
  • 8ac7575d5b frio: closed profile setting sections on page load rabuzarus 2016-06-11 18:51:20 +02:00
  • c2f116f8fd frio short contact informations - some optical polishing rabuzarus 2016-06-11 17:43:02 +02:00
  • 5fc0f06786 Merge pull request #2590 from rabuzarus/1106_finding_string Michael Vogel 2016-06-11 11:53:20 +02:00
  • 35b6c93ba4 reset gitignore rabuzarus 2016-06-11 10:57:45 +02:00
  • d39f679230 Merge develop into 1006-short-info rabuzarus 2016-06-11 10:52:26 +02:00
  • ca269b6329 unify heading of search results to "results for:" rabuzarus 2016-06-11 10:44:52 +02:00
  • 212fc203d9 Merge pull request #2588 from fabrixxm/nginx-sample-docs Michael Vogel 2016-06-11 10:27:53 +02:00
  • d48afb6c1b Merge pull request #2586 from rabuzarus/1006-search Michael Vogel 2016-06-11 10:26:20 +02:00
  • acb50b343e Merge pull request #2589 from rabuzarus/1106-admin-clean Michael Vogel 2016-06-11 10:21:43 +02:00
  • eafad7145b mod/admin.php: some clean up rabuzarus 2016-06-11 10:12:03 +02:00
  • 2ec06c1a38 use js/modal.js to show Login page in modal fabrixxm 2016-06-11 09:58:26 +02:00
  • f8c62f0407 Frio: make jslint more happy fabrixxm 2016-06-11 09:40:50 +02:00
  • fbb905a5c2 Move Nginx reverse proxy sample from INSTALL to separate file fabrixxm 2016-06-11 09:27:00 +02:00
  • 70f97a3536 frio: a short contact informations - better fadeOut handling rabuzarus 2016-06-11 01:40:28 +02:00
  • 3c49a410e5 frio: a short contact informations - add border-radius to profile picture (this fits better to the rest of the profile pictures) rabuzarus 2016-06-11 01:32:29 +02:00
  • 53fb8b1181 frio: a short contact informations will be provided at the second nav bar by scrolling down (on pages where vcard is available) rabuzarus 2016-06-11 01:28:25 +02:00
  • 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 rabuzarus 2016-06-10 20:34:25 +02:00
  • 710822dca7 Merge pull request #2585 from fabrixxm/update_config_classes rabuzarus 2016-06-10 13:35:00 +02:00
  • 136ae34245 Add $default_value parameter to Config::get() and PConfig::get() Fabrixxm 2016-06-10 12:00:34 +02:00
  • 6c346b1ab6 Move Config and PConfig classes in \Friendica\Core namespace Fabrixxm 2016-06-10 11:52:01 +02:00
  • f2e79e976d set include/ folder base for 'Friendica' PSR4 namespace Fabrixxm 2016-06-10 11:50:52 +02:00
  • e773da9ea2 frio + core: forgot to delete a comment rabuzarus 2016-06-10 11:29:23 +02:00
  • 3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings rabuzarus 2016-06-10 11:24:38 +02:00
  • 60c1172e7e Merge pull request #2576 from rabuzarus/0806-PConfig fabrixxm 2016-06-10 11:13:08 +02:00
  • 8c1422103e Frio: login button opens a modal Fabrixxm 2016-06-10 10:40:13 +02:00
  • ee06d2fa3c Merge pull request #2582 from annando/1606-more-avatar-stuff Tobias Diekershoff 2016-06-10 09:39:01 +02:00
  • 0f8148a4cb Merge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop fabrixxm 2016-06-10 08:36:11 +02:00
  • 807fbe173b Some more places where the avatar picture is taken from the database Michael Vogel 2016-06-10 07:44:32 +02:00
  • baf68af735 Merge pull request #2581 from tobiasd/adm-workerqueue Michael Vogel 2016-06-10 00:03:37 +02:00
  • c9342ccf1d Merge pull request #2579 from rabuzarus/0806-content-experimental Michael Vogel 2016-06-10 00:01:33 +02:00
  • e8d39b290a show the workerqueue in the admin panel summary Tobias Diekershoff 2016-06-09 18:08:40 +02:00
  • 89f4d9f164 Merge pull request #2580 from rabuzarus/0906-search-strings fabrixxm 2016-06-09 14:47:05 +02:00
  • 15959d7767 Renamed "Nickname or Email address:" in "Nickname or Email" rabuzarus 2016-06-09 13:12:39 +02:00
  • e4ba493a01 Renamed "Search results for:" in "Results for:" to have more space on mobile rabuzarus 2016-06-09 13:06:21 +02:00
  • 30056dd22d Merge pull request #2578 from annando/1606-bugfix-contact rabuzarus 2016-06-09 02:18:54 +02:00
  • 5a48ab5a8c content.php: remove load_contact_links() rabuzarus 2016-06-09 01:39:45 +02:00
  • 9e5a4b2050 content: make experimental mod/content.php work again rabuzarus 2016-06-09 01:35:57 +02:00
  • 871fa4c777 Merge pull request #2577 from rabuzarus/0806-frio-html-cache Michael Vogel 2016-06-08 22:56:47 +02:00
  • 098a8ac6c2 Bugfix: In threads the contact data from users weren't taken. Michael Vogel 2016-06-08 22:50:57 +02:00
  • 023c43fa4a config && pconfig: return NULL if config is unset rabuzarus 2016-06-08 21:52:10 +02:00
  • f79a7bc455 frio: improvements it js jot behavior - cache the original jot everytime (to restore it after modal close) - possibility to edit event items rabuzarus 2016-06-08 20:53:01 +02:00
  • 7e8ea1cb87 move config to its own class (with legacy support) rabuzarus 2016-06-08 11:02:18 +02:00
  • 17f362f4f6 Merge pull request #2575 from annando/1606-shared-template Tobias Diekershoff 2016-06-08 09:54:54 +02:00
  • aad00ddc04 Renamed template Michael Vogel 2016-06-08 07:11:16 +02:00
  • f59b21d4a8 Merge remote-tracking branch 'upstream/develop' into 1606-shared-template Michael Vogel 2016-06-07 22:40:29 +02:00
  • d034822f07 Merge pull request #2574 from rabuzarus/0607-saved-search Michael Vogel 2016-06-07 22:38:50 +02:00
  • e2e32eecac New template for shared content instead of hardcoded stuff in source Michael Vogel 2016-06-07 22:29:50 +02:00
  • 26336a60e9 content_wrapper.tpl respects content with no title rabuzarus 2016-06-07 16:38:22 +02:00
  • 71b30e0651 profice a general content wrapper template. rabuzarus 2016-06-07 16:32:02 +02:00
  • 3a368214c0 frio: saved_searches_aside & searchbox template rabuzarus 2016-06-07 15:29:38 +02:00
  • 03c09e4c3f Merge pull request #2573 from rabuzarus/0606-more-hovercard Tobias Diekershoff 2016-06-07 11:32:56 +02:00
  • 60ca6b7f07 frio: some hover card css fixes (enable on mouseleave again - forgot it) rabuzarus 2016-06-07 10:16:31 +02:00
  • d570a90c05 frio: some hover card css fixes rabuzarus 2016-06-07 10:13:08 +02:00
  • 1dd77ee443 Merge pull request #2569 from tobiasd/doc-settings-de Michael Vogel 2016-06-07 07:57:29 +02:00
  • 68286910a3 Merge pull request #2570 from annando/1606-database Tobias Diekershoff 2016-06-07 07:29:01 +02:00
  • 04594666dc Typos Tobias Diekershoff 2016-06-07 06:53:37 +02:00
  • c7ab2d2482 Merge remote-tracking branch 'upstream/develop' into 1606-database Michael Vogel 2016-06-07 06:12:28 +02:00
  • bd01a1c63a Merge pull request #2572 from rabuzarus/0606-more-hovercard Michael Vogel 2016-06-07 06:10:46 +02:00
  • 69695608ba Merge pull request #2571 from rabuzarus/0706-widgets Michael Vogel 2016-06-07 06:10:05 +02:00
  • d752ea9abc frio: fix close hovercard on mousleave rabuzarus 2016-06-07 01:42:01 +02:00
  • 615db43736 frio: add group_side widget template rabuzarus 2016-06-07 01:28:38 +02:00
  • c87d426d5f frio: follow & peoplefind widget template rabuzarus 2016-06-07 00:38:39 +02:00
  • fc66a86dc5 Some optimized sql queries Michael Vogel 2016-06-06 22:57:27 +02:00
  • 06c0588817 German translation of doc/Settings, part of #2194 Tobias Diekershoff 2016-06-06 22:17:40 +02:00
  • 8feeb8200d Merge pull request #2568 from annando/1606-process2 Tobias Diekershoff 2016-06-06 21:48:59 +02:00
  • db44ea0482 Merge pull request #2567 from rabuzarus/0606-photo-menu Michael Vogel 2016-06-06 21:28:25 +02:00
  • 79fd49f611 Exit with "system unavailable" when the maximum number of processes is reached Michael Vogel 2016-06-06 21:22:54 +02:00
  • 9d72c3d170 Merge pull request #2565 from rabuzarus/0606-confic-docu Tobias Diekershoff 2016-06-06 18:31:37 +02:00
  • 9d3ca5a463 Merge pull request #2566 from rabuzarus/0606-more-hovercard Tobias Diekershoff 2016-06-06 18:29:34 +02:00
  • d80c21b15f Merge pull request #2561 from annando/1606-dbm Tobias Diekershoff 2016-06-06 18:11:39 +02:00
  • 5c52736221 photo_menu: now the photo_menu does have at all places the same structure rabuzarus 2016-06-06 16:54:29 +02:00
  • 33ad8bdc53 frio: extend hovercard to wall-item-responses (likes, attendend) and wall-item-bottom mentions rabuzarus 2016-06-06 11:05:29 +02:00
  • fa02d0f2f8 rename PConfig::del to PConfig:delete rabuzarus 2016-06-06 10:46:33 +02:00
  • f10011c282 move pconfig to it's own class PConfig rabuzarus 2016-06-06 10:22:14 +02:00
  • 5f081cc47b add doxygen to config functions rabuzarus 2016-06-06 10:01:14 +02:00
  • 3d27ebcb34 Added documentation Michael Vogel 2016-06-06 06:29:03 +02:00
  • a25d58b2ee Merge remote-tracking branch 'upstream/develop' into 1606-dbm Michael Vogel 2016-06-06 06:21:36 +02:00
  • ec89274cd8 Merge pull request #2563 from rabuzarus/0506-contact-transition Tobias Diekershoff 2016-06-06 06:07:09 +02:00
  • 8932bec614 Merge pull request #2564 from annando/1606-contact-handling Tobias Diekershoff 2016-06-06 06:06:21 +02:00
  • 8fbcba0096 The local contact search now uses local data if present Michael Vogel 2016-06-05 22:21:34 +02:00
  • 3e7e866e13 Baseurl removed Michael Vogel 2016-06-05 21:22:14 +02:00
  • 4b640dbd97 Fetching of profile data improved Michael Vogel 2016-06-05 21:17:55 +02:00
  • ea3a6ec6eb Some more cleanup and code removal. Michael Vogel 2016-06-05 20:01:38 +02:00
  • 43b0550094 frio: remove legacy transition css rabuzarus 2016-06-05 17:12:13 +02:00
  • 98272fe386 Some better handling of "bd" and "birthday" Michael Vogel 2016-06-05 15:09:40 +02:00
  • 572402224f "bd" now always shows the upcoming birthday Michael Vogel 2016-06-05 15:03:04 +02:00
  • 71d3274841 Unified contact data handling Michael Vogel 2016-06-05 13:57:11 +02:00
  • 84e5276a3a frio: give the contact actions a little transition effect rabuzarus 2016-06-05 09:56:53 +02:00
  • 20ab3f13a6 Merge pull request #2562 from friendica/fabrixxm-patch-1 Tobias Diekershoff 2016-06-04 19:40:46 +02:00
  • a0b7a6684f Wild "+" in js/main.js fabrixxm 2016-06-04 18:44:20 +02:00