rabuzarus
|
39b37281a7
|
Merge develop into 3011_hcard_vcard
|
2015-12-01 18:34:13 +01:00 |
|
rabuzarus
|
89c5989cfb
|
unify hcard and vcard
|
2015-12-01 18:31:08 +01:00 |
|
Michael Vogel
|
06a4b0dc5e
|
Header removed in the contact area
|
2015-12-01 18:21:05 +01:00 |
|
|
Michael Vogel
|
fe900ac576
|
Merge remote-tracking branch 'upstream/develop' into 1512-contact-rework
|
2015-12-01 17:16:31 +01:00 |
|
|
Michael Vogel
|
6910604ffb
|
Merge pull request #2125 from rabuzarus/2911_event_template
vier event_form: include bb-tags for editing
|
2015-12-01 17:13:46 +01:00 |
|
|
Michael Vogel
|
1c93729c46
|
Tab is added to "all friends" and "common friends"
|
2015-12-01 08:12:05 +01:00 |
|
|
rabuzarus
|
39b85c8486
|
vier event_form: include bb-tags for editing
|
2015-11-30 16:00:41 +01:00 |
|
fabrixxm
|
2753e62483
|
Merge pull request #2119 from annando/1511-contact-evolution
Refurbished contact settings/contact posts
|
2015-11-30 14:45:23 +01:00 |
|
|
fabrixxm
|
a60b702df1
|
Merge pull request #2113 from annando/1511-manage-notifications
The manage page now shows the notifications
|
2015-11-30 12:04:53 +01:00 |
|
|
Michael Vogel
|
4efb6c6f79
|
Merge pull request #2120 from rabuzarus/2911_network_header
2911 network header
|
2015-11-30 08:30:34 +01:00 |
|
|
rabuzarus
|
a6aac8f950
|
networkheader: do css work the other supported themes
|
2015-11-30 01:24:22 +01:00 |
|
|
Michael Vogel
|
42d903dd68
|
Redesign of the contact pages, new tab for contact statuses
|
2015-11-29 23:22:05 +01:00 |
|
|
Michael Vogel
|
5649e9e193
|
The contact page now contains more data
|
2015-11-29 17:04:48 +01:00 |
|
|
rabuzarus
|
70860e5836
|
new_event: default size of textfields
|
2015-11-29 16:16:18 +01:00 |
|
|
Michael Vogel
|
583a2f709b
|
Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design
|
2015-11-29 10:25:44 +01:00 |
|
Tobias Diekershoff
|
be40fb8186
|
Merge pull request #2110 from annando/1511-subscribe-feed
Issue 1779: Atom feed link under the connect link on the profile page
|
2015-11-29 08:40:39 +01:00 |
|
|
rabuzarus
|
f5597da059
|
forumlist - mark selected forum as selected
|
2015-11-28 23:52:12 +01:00 |
|
|
Michael Vogel
|
3067663909
|
The manage page now shows the unread notifications
|
2015-11-28 22:56:48 +01:00 |
|
|
rabuzarus
|
a3059d02d4
|
group_side - unify look with forumlist
|
2015-11-28 20:09:28 +01:00 |
|
|
Michael Vogel
|
388847e1f3
|
Issue 1779: There is now an atom feed link under the connect link on the profile page
|
2015-11-28 18:11:34 +01:00 |
|
|
Michael Vogel
|
679ce3243e
|
Admin settings for table optimisation
|
2015-11-28 16:35:16 +01:00 |
|
|
Michael Vogel
|
3b6d3d1ade
|
Merge pull request #2099 from rabuzarus/2611_new_user_addr
generate addr for new registered users
|
2015-11-27 21:35:46 +01:00 |
|
|
rabuzarus
|
620299dc25
|
include friendica address in hcard
|
2015-11-26 17:46:38 +01:00 |
|
|
rabuzarus
|
ddf3589fc5
|
count unread forum items for forumlist widget (ping.php)
|
2015-11-24 22:14:26 +01:00 |
|
|
Michael Vogel
|
41fe07e128
|
Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix
|
2015-11-17 21:34:01 +01:00 |
|
|
Michael Vogel
|
edb303d44a
|
Merge pull request #2086 from rabuzarus/0711_forumlist
0711 forumlist
|
2015-11-17 21:33:25 +01:00 |
|
|
rabuzarus
|
a07a0fd1d7
|
forumlist: fix id conflict and js show-more
|
2015-11-17 20:57:12 +01:00 |
|
|
Michael Vogel
|
4b21512f56
|
This is a quick fix for the the forumlist.
|
2015-11-17 19:56:32 +01:00 |
|
|
Michael Vogel
|
e43c7a4447
|
Merge pull request #2061 from rabuzarus/0711_forumlist
move forumlist addon to core
|
2015-11-17 08:46:15 +01:00 |
|
|
Fabrixxm
|
0a9e017d34
|
Installer use static css, fix #2071
|
2015-11-13 10:56:06 +01:00 |
|
|
rabuzarus
|
902735f6d4
|
forumlist: dbupdate
|
2015-11-11 23:39:14 +01:00 |
|
|
rabuzarus
|
abf9ebd466
|
forumlist: small fix
|
2015-11-10 12:53:56 +01:00 |
|
|
rabuzarus
|
96b764425e
|
move forumlist addon to core
|
2015-11-09 15:56:20 +01:00 |
|
|
fabrixxm
|
c700a6fb37
|
duepuntozero, vier: add unread messages per group
|
2015-11-08 18:02:04 +01:00 |
|
|
Tobias Diekershoff
|
631afe5810
|
Merge pull request #2035 from FlxAlbroscheit/develop
Preview the last 5 conversations in message-sidebar
|
2015-11-08 16:03:04 +01:00 |
|
|
fabrixxm
|
ae9c9829fa
|
Remove language selectors from themes
This is now a user setting
|
2015-11-08 14:42:54 +01:00 |
|
|
fabrixxm
|
fb3ac68cc0
|
Add user language in settings, use that field as language for UI
|
2015-11-08 14:23:49 +01:00 |
|
|
fabrixxm
|
0363bab040
|
js: add new Dialog object
The Dialog is used by code to show urls in colorbox.
Templates can overwrite `show()` function to change its behaviour
|
2015-11-08 12:01:19 +01:00 |
|
FlxAlbroscheit
|
603dad93f3
|
Preview last five conversations in message-sidebar
|
2015-11-07 18:54:20 +01:00 |
|
|
fabrixxm
|
5f6ea6357d
|
Add 'Reload active themes' to admin
It will call 'uninstall()' and 'install()' on every active themes
|
2015-11-06 23:53:10 +01:00 |
|
|
rabuzarus
|
e785759a8b
|
template-rework:make use of get_contact_details_by_url()
|
2015-11-03 14:31:15 +01:00 |
|
|
rabuzarus
|
f196389580
|
Merge develop into allfriends
|
2015-11-02 14:31:20 +01:00 |
|
|
Michael Vogel
|
709aac0652
|
Only offer the choice to activate Diaspora and OStatus if the system is ready for it
|
2015-11-01 13:55:49 +01:00 |
|
|
Tobias Diekershoff
|
c00847a79d
|
use section_title.tpl for page title
|
2015-10-30 18:05:45 +01:00 |
|
|
Tobias Diekershoff
|
a48156aab6
|
display names listed in credits.txt from /credits
|
2015-10-29 08:48:41 +01:00 |
|
|
rabuzarus
|
299c8b83ac
|
template-rework: let common friends and allfriends use viewcontact_template.tpl
|
2015-10-27 15:27:26 +01:00 |
|
|
Tobias Diekershoff
|
367699f785
|
Merge pull request #1987 from annando/1510-manage-enhancements
Some small optical and structural changes to the manage template
|
2015-10-27 09:01:35 +01:00 |
|
|
Tobias Diekershoff
|
4079084492
|
Merge pull request #1975 from rabuzarus/template_rework
Template rework for contact related pages
|
2015-10-27 08:59:03 +01:00 |
|
|
Michael Vogel
|
99ee45e627
|
The username is now a link
|
2015-10-26 23:11:42 +01:00 |
|
|
Michael Vogel
|
ac744b61f9
|
Some small optical and structural changes to the manage template
|
2015-10-26 08:16:37 +01:00 |
|
|
rabuzarus
|
4c263aa4ac
|
Merge develop into manage
Conflicts:
view/global.css
|
2015-10-25 16:57:04 +01:00 |
|
|
Tobias Diekershoff
|
03ff349a94
|
Merge pull request #1982 from annando/1510-reduced-profile
Profile data are now reduced to only the most important fields
|
2015-10-25 16:54:24 +01:00 |
|
|
rabuzarus
|
bac61cf596
|
manage-selector: some cleanup and css work
|
2015-10-25 16:49:45 +01:00 |
|
|
Michael Vogel
|
78a8db55c6
|
Merge pull request #1981 from rabuzarus/poke
some work on poke template
|
2015-10-25 14:59:39 +01:00 |
|
|
rabuzarus
|
e0e6762ed8
|
some inital work to have profile pics on manage page
|
2015-10-25 14:00:08 +01:00 |
|
|
Michael Vogel
|
4631c13d08
|
Profile data are now reduced to only the most important fields
|
2015-10-25 09:15:36 +01:00 |
|
|
rabuzarus
|
8f92b6eea4
|
some work on poke template
|
2015-10-24 19:51:58 +02:00 |
|
|
rabuzarus
|
eb33698556
|
some minor changes in crepair.tpl
|
2015-10-24 16:01:55 +02:00 |
|
|
rabuzarus
|
ea2b3b2f76
|
move html from crepair.php to template
|
2015-10-24 15:57:46 +02:00 |
|
|
rabuzarus
|
442d59abc4
|
template rework: multi-row view for the other themes
|
2015-10-23 21:45:16 +02:00 |
|
|
rabuzarus
|
86f94570ef
|
template rework: delete unused templates
|
2015-10-23 16:49:12 +02:00 |
|
|
rabuzarus
|
0c3979720f
|
template rework: rearrange sidebar widgets for contact related pages
|
2015-10-23 00:12:00 +02:00 |
|
|
rabuzarus
|
2aad62190f
|
template rework: use viewcontact_template.tpl also for directory
|
2015-10-22 22:48:49 +02:00 |
|
|
rabuzarus
|
f9c0c1d696
|
template rework: use viewcontact_template.tpl for contact dealing pages
|
2015-10-18 17:12:48 +02:00 |
|
|
rabuzarus
|
4c1c614fa6
|
Merge viewcontact into template_rework
|
2015-10-17 22:28:09 +02:00 |
|
|
rabuzarus
|
452a3011f7
|
Merge suggest into template_rework
|
2015-10-17 22:22:52 +02:00 |
|
|
rabuzarus
|
dbf1f9efcd
|
Merge dirfind into template_rework
|
2015-10-17 22:22:35 +02:00 |
|
|
rabuzarus
|
4b8ca578d1
|
dirfind: move pagination into template
|
2015-10-17 22:09:19 +02:00 |
|
|
rabuzarus
|
b9d9bf8ecd
|
directory: move pagination into template
|
2015-10-17 21:45:55 +02:00 |
|
|
rabuzarus
|
6d559bf8a9
|
viewcontact: use section_title.tpl as headding
|
2015-10-17 21:40:41 +02:00 |
|
|
rabuzarus
|
9176e739a4
|
sugest.php: themeable as whole page
|
2015-10-17 21:25:21 +02:00 |
|
|
rabuzarus
|
72896b0f6b
|
unify directory page
|
2015-10-17 19:45:57 +02:00 |
|
|
rabuzarus
|
20bb16859f
|
dirfind.php: move html to templates
|
2015-10-17 00:19:01 +02:00 |
|
|
rabuzarus
|
6ebb21a935
|
directory.php: move html to templates
|
2015-10-16 21:44:10 +02:00 |
|
|
fabrixxm
|
fd8e8d005a
|
attend functionality for duepuntozero
|
2015-10-12 20:09:33 +02:00 |
|
|
rabuzarus
|
649578ae33
|
Merge develop-new into event-attendance-new
Conflicts:
include/conversation.php
|
2015-10-11 19:39:55 +02:00 |
|
|
Michael Vogel
|
efbdb57f92
|
Reworked contact relations between Friendica and Diaspora
|
2015-10-10 11:06:18 +02:00 |
|
|
Michael Vogel
|
607817d1b3
|
Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.
|
2015-10-05 17:38:57 +02:00 |
|
|
Michael Vogel
|
d3ac3f8490
|
Added the contact menu to the search as well.
|
2015-10-05 08:08:59 +02:00 |
|
|
Michael Vogel
|
72ecb9e67b
|
Bugfix: Repairing a contact was more like killing the contact ...
|
2015-10-04 19:39:55 +02:00 |
|
|
Michael Vogel
|
4003b9cc5d
|
Let the notification look more like the follow dialog
|
2015-10-04 17:18:58 +02:00 |
|
|
Michael Vogel
|
83ea4f7253
|
transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.
|
2015-10-04 15:55:24 +02:00 |
|
|
Michael Vogel
|
d0ae5ce326
|
Show more information when following a new contact
|
2015-10-04 14:41:39 +02:00 |
|
|
Michael Vogel
|
42ad8c2b25
|
New template for http status messages
|
2015-10-03 23:19:09 +02:00 |
|
|
Tobias Diekershoff
|
d6beb7db1f
|
add a header to seperate the beginning of week settings
|
2015-10-01 06:19:57 +02:00 |
|
|
Michael Vogel
|
389b7de451
|
Setting for the first day of the week
|
2015-09-30 19:18:13 +02:00 |
|
|
rabuzarus
|
7cb4ea52fd
|
port of the event attendance feature of red matrix with example implementation for vier theme.
|
2015-09-30 16:58:02 +02:00 |
|
|
rabuzarus
|
f5c7006f30
|
rest of the consensus porting work and integration into friendica
Credits to Mike Macgirvin for the code
|
2015-09-30 14:38:13 +02:00 |
|
|
Michael Vogel
|
6e981ed798
|
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
|
2015-09-29 10:35:50 +02:00 |
|
|
Michael Vogel
|
c33957a6e9
|
Internationalisation of events/Move events to the navigation bar
|
2015-09-27 14:00:15 +02:00 |
|
|
Michael Vogel
|
25fc2c9799
|
Some changes to stay compatible to Diaspora
|
2015-09-19 14:00:33 +02:00 |
|
|
Michael Vogel
|
5ac38b7f99
|
There is now only one central parameter for the global directory.
|
2015-09-15 22:29:02 +02:00 |
|
|
Michael Vogel
|
c6d9b2da23
|
New setting for requery days
|
2015-09-05 10:54:39 +02:00 |
|
|
Michael Vogel
|
56ae056f1d
|
The "manage" option list is now larger.
|
2015-08-30 22:45:48 +02:00 |
|
|
Michael Vogel
|
6942b16ef5
|
See issue 1855. OOhembed is removed.
|
2015-08-25 19:50:23 +02:00 |
|
|
Michael Vogel
|
b1dddd2936
|
Only offer forum search in local mode.
|
2015-08-25 05:54:50 +02:00 |
|
|
Tobias Diekershoff
|
26c5c7991a
|
Merge pull request #1849 from fabrixxm/issue-1841
filebrowser: link image to original picture, show error messages
|
2015-08-24 14:26:09 +02:00 |
|
|
fabrixxm
|
cbabac298d
|
filebrowser: link image to original picture, show error messages
|
2015-08-24 13:54:41 +02:00 |
|
|
Michael Vogel
|
3bca2db11b
|
Don't show search options in side bar.
|
2015-08-24 12:12:14 +02:00 |
|
|
Michael Vogel
|
3ff196f00d
|
Now you can set search options so that searching for contacts or forums isn't occult science anymore.
|
2015-08-24 11:55:29 +02:00 |
|