Commit graph

3128 commits

Author SHA1 Message Date
rabuzarus
55205e344f Merge pull request #2632 from annando/1606-parse-title
Always parse the first title element
2016-06-23 10:18:58 +02:00
Michael Vogel
8cabcda5e0 Always parse the first title element 2016-06-22 21:00:58 +02:00
rabuzarus
cd92a0dc34 Merge pull request #2624 from annando/1606-contact-id
Item: New fields for author id and owner id - avatar improvement with relocation
2016-06-22 14:26:39 +02:00
Michael Vogel
9a7653a4fe Store the author-id and owner-id in mod/item.php as well 2016-06-21 07:54:45 +02:00
rabuzarus
d076f61a4a cal export - little fix for json 2016-06-20 23:38:34 +02:00
rabuzarus
71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
Michael Vogel
939bd965c5 Search query optimized 2016-06-20 22:03:40 +02:00
Michael Vogel
65b541413f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-20 07:28:47 +02:00
rabuzarus
7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel
51b5d16f1b Improved SQL queries 2016-06-19 21:41:06 +02:00
Michael Vogel
91db7a549c Optimised the amount of function for the item query 2016-06-19 08:32:38 +02:00
Michael Vogel
e512a83ecc Massively updated avatar handling 2016-06-19 01:07:20 +02:00
rabuzarus
7dc5fc8b9f Merge develop into 1206-events-template
Conflicts:
	view/theme/frio/css/style.css
2016-06-17 14:33:08 +02:00
rabuzarus
606f42701c frio - event - some js and template refactoring + event view css styling 2016-06-17 14:09:18 +02:00
rabuzarus
c99da380cf frio: events - adapt changes to the templates of the other themes 2016-06-17 10:33:12 +02:00
rabuzarus
82b6917c5f frio: settings_display.tpl + rise frio to 0.2 Alpha 2016-06-13 10:57:42 +02:00
rabuzarus
5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +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
rabuzarus
0af572ffba frio: first part for event template work 2016-06-12 18:23:10 +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
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
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
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