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
26983bafff
Merge pull request #1944 from annando/1510-proxy-picture-size
...
Picture size and bugfix for contact names with "<" and ">"
2015-10-08 08:03:42 +02:00
Michael Vogel
61c3ce7a21
Bugfix: The contact names had to be escaped
2015-10-08 00:25:55 +02:00
Michael Vogel
1f0b759e2f
Added resize possibility to proxy function
2015-10-07 08:25:10 +02:00
b4ec07ab27
IT: update to the strings
2015-10-07 06:20:54 +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
9f68676db6
Merge pull request #1934 from annando/1510-better-notification
...
Let the notification look more like the follow dialog
2015-10-04 17:49:02 +02:00
Michael Vogel
4003b9cc5d
Let the notification look more like the follow dialog
2015-10-04 17:18:58 +02:00
e1f3f2bc6c
Merge pull request #1933 from annando/1510-follow-more-data
...
Show more information when following a new contact
2015-10-04 17:02:27 +02:00
18e8d0de59
Merge pull request #1932 from annando/1510-vier-2
...
Small optical changes in "vier"
2015-10-04 17:01:25 +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
1d71dde7ef
Beautyfied code. Link to "follow" on community profiles
2015-10-04 14:40:02 +02:00
Michael Vogel
3b18c6cb0c
Small optical changes in "vier"
2015-10-04 12:24:00 +02:00
01d38a353c
DE update to the translation
2015-10-04 09:23:58 +02:00
05b2836d66
Merge pull request #1926 from annando/1510-permit-crawler
...
New option to permit crawlers
2015-10-04 08:53:32 +02:00
Michael Vogel
42ad8c2b25
New template for http status messages
2015-10-03 23:19:09 +02:00
Michael Vogel
3ae0deadb6
The right side now contains much stuff from diabook - but completely reworked.
2015-10-03 12:55:55 +02:00
Michael Vogel
47c855388e
Vier: Menu at the right side (inspired and copyied from diabook)
2015-10-01 08:19:35 +02:00
d6beb7db1f
add a header to seperate the beginning of week settings
2015-10-01 06:19:57 +02:00
Michael Vogel
5fe357ee75
Rearrange the navigation bar on smaller windows
2015-09-30 21:59:55 +02:00
Michael Vogel
389b7de451
Setting for the first day of the week
2015-09-30 19:18:13 +02:00
Michael Vogel
68a6f0298e
The events moved from the profile to the navigation bar - for supported themes
2015-09-30 18:50:44 +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
28df4b2cd0
PL update to the strings
2015-09-24 22:09:39 +02:00
Michael Vogel
25fc2c9799
Some changes to stay compatible to Diaspora
2015-09-19 14:00:33 +02:00
976a2be1f7
Merge pull request #1892 from annando/1509-vier-attachements
...
Now attachments of the type "application" are displayed as well.
2015-09-18 21:11:57 +02:00
Michael Vogel
6be65f4eae
Now attachments of the type "application" are displayed as well.
2015-09-18 21:09:31 +02:00
dbc9d87156
DE update to the strings
2015-09-17 14:24:07 +02:00
Michael Vogel
5ac38b7f99
There is now only one central parameter for the global directory.
2015-09-15 22:29:02 +02:00
8504cf4f05
Merge pull request #1880 from annando/1509-performance
...
Some settings to control the system load
2015-09-06 09:02:27 +02:00
Michael Vogel
c6d9b2da23
New setting for requery days
2015-09-05 10:54:39 +02:00
4db21f85c4
DE, ES, IT: update to the translations
2015-09-01 15:12:09 +02:00
32c063b9a5
IT update to the translations
2015-08-31 19:02:12 +02:00
3665ab3de0
FR update to the translations
2015-08-31 19:01:56 +02:00
fe5a5c72f5
ES update to the translations
2015-08-31 19:01:42 +02:00
af48217465
Merge pull request #1870 from annando/1508-soapbox
...
Soapbox-Improvements
2015-08-31 06:53:54 +02:00
Michael Vogel
56ae056f1d
The "manage" option list is now larger.
2015-08-30 22:45:48 +02:00
Michael Vogel
cc3419f101
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
...
Conflicts:
mod/dfrn_notify.php
2015-08-30 10:44:29 +02:00
9aa1e22047
CS update to the strings
2015-08-30 07:24:39 +02:00
Michael Vogel
31fffcf281
Accidentally removed a file
2015-08-29 17:09:25 +02:00
Michael Vogel
82e682ef45
The click behaviour of the top menu bar is now changed completely
2015-08-29 10:14:41 +02:00
Michael Vogel
e25457ab68
Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu
2015-08-28 14:16:52 +02:00
Michael Vogel
319df2ed66
The menu bar isn't clickable anymore
2015-08-28 11:36:43 +02:00
Michael Vogel
14af9cd2e8
Remove the unneeded menu buttons-
2015-08-27 00:50:04 +02:00
Michael Vogel
92fbf1bcbd
Vier: Use CSS for popup menu
2015-08-27 00:02:06 +02:00
7da830c9f6
DE update to the strings
2015-08-26 16:40:31 +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
Michael Vogel
d1647222d3
Vier: The "register" page now looks better.
2015-08-24 19:03:03 +02:00
cc145f0e25
Merge pull request #1850 from tobiasd/20150824-de
...
DE updated translation
2015-08-24 14:27:13 +02:00
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
489e90281a
DE updated translation
2015-08-24 14:21:22 +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
fc18123082
Merge pull request #1837 from fabrixxm/feature-1796
...
add support for oneline,in-text code tag
2015-08-23 17:27:45 +02:00
fabrixxm
2d75e1f422
add support for oneline,in-text code tag
2015-08-20 15:08:55 +02:00
fabrixxm
81d1dfc006
add 'reload active plugins' button in admin/plugins
2015-08-20 15:01:15 +02:00
Michael Vogel
e6b85c822d
frost-mobile has now a link to the original post. See issue 1793
2015-08-18 20:30:01 +02:00
Michael Vogel
6ae34f4802
Merge pull request #1828 from tobiasd/20150816-fix1621
...
add the profile url to the settings pages as alternative to the webfi…
2015-08-17 21:51:03 +02:00
b67adebd9c
DE update to the strings
2015-08-17 12:02:03 +02:00
621dec1606
reconstruct the description for more flexible translations
2015-08-17 07:20:50 +02:00
eea258f74c
add the profile url to the settings pages as alternative to the webfinger. See issue 1621
2015-08-16 22:39:08 +02:00
Michael Vogel
c2a1cf958d
The addon "statistics_json" becomes the system setting "nodeinfo"
2015-08-16 21:45:51 +02:00
4ca515ab33
Merge pull request #1823 from annando/issue-1348
...
The login form in the aside section should look now better
2015-08-15 07:19:05 +02:00
Michael Vogel
72c8fff909
Improved register link and open-id input.
2015-08-15 07:08:32 +02:00
Michael Vogel
efec7e973e
This hopefully will solve issue 1348
2015-08-14 23:32:10 +02:00
bb4e339d8f
DE update to the strings
2015-08-14 13:03:55 +02:00
Michael Vogel
887372a0d7
Bugfix: Conversations with Diaspora now work reliable
2015-08-13 22:49:57 +02:00
5013e5daf1
use to link to queue inspector
2015-08-12 19:58:53 +02:00
f439ac47c4
admin panel: inspect queue
2015-08-12 15:44:59 +02:00
6b93325f70
make Inspect Queue link visible in admin adide menu
2015-08-12 15:44:03 +02:00
9d0786531d
Merge pull request #1810 from annando/issue-1739
...
Contact requests now contain more information.
2015-08-12 08:17:27 +02:00
Michael Vogel
a0f69dc92c
Contact requests now contain more information.
2015-08-12 08:07:21 +02:00
Michael Vogel
e1088210a6
CSS improved
2015-08-11 22:47:37 +02:00
6cfe7b698e
Merge pull request #1803 from annando/1508-accessibility
...
Improved accessibility
2015-08-10 08:48:48 +02:00
Michael Vogel
ea14f7e716
Duepontozero now has accesskeys as well.
2015-08-09 12:19:15 +02:00
Michael Vogel
d500ea4324
Some more accesskeys for Quattro
2015-08-09 09:55:51 +02:00
Michael Vogel
d65d74d460
Added the changes in quattro as well
2015-08-09 09:28:10 +02:00
Michael Vogel
811e4b6ba1
Documentation for accesskeys added
2015-08-09 09:16:45 +02:00
Michael Vogel
ccaeb00973
Better link descriptions.
2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
Michael Vogel
a8a21da6f5
Some steps for a better screen reader compatibility
2015-08-06 08:13:15 +02:00
26ec1fbf34
FR: update to the translations
2015-08-05 07:11:39 +02:00
43b2e69421
DE: update of the translation
2015-08-04 08:06:49 +02:00
cd8be48ca7
Merge pull request #1791 from annando/1507-new-poco
...
Improved Local Directory
2015-08-02 10:31:34 +02:00
rabuzarus
bef827f1cc
small fixes for filebrowser
2015-08-01 21:20:13 +02:00
Fabrixxm
b7aa259c67
hide buglink
2015-07-30 14:19:50 +02:00
Fabrixxm
f5657e283c
fix folder links in filebrowser dialog
2015-07-29 11:55:26 +02:00
Fabrixxm
52f9465578
filebrowser fixs, use it in comment textareas
...
move filebrowser js to single file
document filebrowser usage
replace "onclick" for comment style buttons with data-* and move logic to main.js
use filebrowser to insert images in comments
2015-07-29 11:30:04 +02:00
Fabrixxm
70b7de39a7
Upload/Browse popup for files and images
...
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
2015-07-28 17:20:40 +02:00
Michael Vogel
9717fa82fe
New field "created" in gcontacts. New option for timeframe when polling global contacts
2015-07-21 00:05:44 +02:00
Michael Vogel
f3c83fb514
Automatically updating the searched contacts while searching it.
2015-07-19 18:02:24 +02:00
Michael Vogel
0bede65a6b
Use local search
2015-07-19 13:23:01 +02:00
8bfbb935c7
add missing icons to quattros event view
2015-07-19 10:56:40 +02:00
Michael Vogel
2a5fb7b175
Option to discover contacts from remote users (fallback option)
2015-07-19 09:41:36 +02:00
Michael Vogel
a0734ceede
Merge remote-tracking branch 'upstream/develop' into 1507-new-poco
2015-07-18 22:37:39 +02:00
Michael Vogel
cf3214c904
Query other servers periodically for their known contacts
2015-07-18 22:26:06 +02:00
9bb805f3dc
show profile url in contact-edit overview listing
2015-07-18 10:57:31 +02:00
Michael Vogel
f1e7369283
Poco: Option to activate and deactivate detection of last activity.
2015-07-18 00:48:42 +02:00
bbd2e4abc1
make the 'noshare' checkbox checked by default for photo upload
2015-07-17 17:05:55 +02:00
ba790def22
NL update to the strings
2015-07-14 16:31:45 +02:00
9e138a42f2
Merge pull request #1758 from annando/1507-salmon
...
OStatus Salmon improvements (Follow, Unfollow works)
2015-07-14 16:24:54 +02:00
Michael Vogel
9ebaa45670
Removed unused template
2015-07-13 23:56:45 +02:00
a54dd8a9db
DE: update to the strings
2015-07-13 08:14:00 +02:00
1efda90498
Merge pull request #1755 from annando/1507-template-update
...
Vier: Some template updates
2015-07-12 21:08:11 +02:00
Michael Vogel
5f86d3d325
removed the picture width, since it is already in the style sheet.
2015-07-12 20:31:49 +02:00
Michael Vogel
6a646d68c5
Updated templates for "vier" (See issue 1733)
2015-07-12 20:27:54 +02:00
Michael Vogel
e22ce8403e
Merge pull request #1752 from tobiasd/20150712-issue1747
...
issue 1747
2015-07-12 18:12:19 +02:00
rabuzarus
2c39387e44
fix for saving searches
2015-07-12 17:43:50 +02:00
d920cf25b0
dont use an empty li, but make a new list for visual separation
2015-07-12 16:16:54 +02:00
Michael Vogel
bc6e5a4f2d
Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links
2015-07-06 17:35:48 +02:00
Fabrixxm
95945ecae6
Merge branch 'master' into develop
2015-07-06 16:56:49 +02:00
Michael Vogel
c356da2cad
Diaspora: Improved parsing of linefeeds
2015-07-05 02:33:28 +02:00
3349bba665
Merge pull request #1722 from annando/1506-password-on-install
...
Ability to enter a password when the first user is created
2015-07-01 07:53:25 +02:00
Michael Vogel
055ee962c9
Ability to enter a password when the first user is created
2015-06-30 23:37:31 +02:00
rabuzarus
cf2a90dfa2
system settings is now a variable in settings_display.tpl
2015-06-30 14:51:14 +02:00
b8f99f459b
DE update to the strings
2015-06-30 09:45:05 +02:00
d4fa6ccfe8
IT update to the strings
2015-06-30 09:44:53 +02:00
fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
rabuzarus
36abf624d8
make supported themes compatible with get_theme_uid
2015-06-29 23:03:44 +02:00
fabrixxm
28f0e9a2de
Merge pull request #1696 from rabuzarus/acl-var
...
move jotnets to populate_acl
2015-06-29 13:53:37 +02:00
Michael Vogel
b9c42c37d1
Vier: Colors for notifications changed
2015-06-29 08:00:52 +02:00
Michael Vogel
b795bf2935
Merge pull request #1683 from fabrixxm/issue-1655
...
Deprecate RINO1 function, implements RINO2, remove unused crypro functions
2015-06-27 17:39:00 +02:00
rabuzarus
8cca849c2e
Merge acl-var into develop
...
Conflicts:
mod/settings.php
2015-06-27 15:23:19 +02:00
rabuzarus
d8c0c62331
work on supported themes to use new acl
2015-06-26 15:44:32 +02:00
Michael Vogel
6eebfb2e13
Merge pull request #1692 from fabrixxm/desktopnotifications
...
Desktop notifications
2015-06-26 08:45:16 +02:00
rabuzarus
37501a883e
make notes work
2015-06-25 22:57:26 +02:00
rabuzarus
94b21245bc
some more work to get acl data into populate_acl
2015-06-25 18:57:42 +02:00
fabrixxm
d2a593b4a0
Merge pull request #1693 from rabuzarus/events-reminder
...
use title in events-reminder
2015-06-25 15:06:55 +02:00
rabuzarus
d23440af15
use colorbox to display upcomming events
2015-06-25 13:43:41 +02:00
Fabrixxm
6fc864c947
rework mod/ping and desktop notification logic
...
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
Michael Vogel
0bac4722cb
Vier: Just another thread improvment
2015-06-24 21:49:51 +02:00
Fabrixxm
e29d05ce4a
notifications order, unseen css class
...
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
2015-06-24 16:10:06 +02:00
Michael Vogel
3841c41186
Improved width for nested comments.
2015-06-24 14:20:08 +02:00
Fabrixxm
cc9da2512b
move field help text css to global.css
2015-06-24 10:11:11 +02:00
Fabrixxm
4036ad2554
Fix desktop notification
...
use on/off field for enable/disable desktop notification
show only new notifications after enable
use localstorage to save enabled/disalbed and last notification id
hide settings on browsers without desktop notification
2015-06-24 09:49:53 +02:00
Fabrixxm
511c2d2c91
rino: settings in admin, choose lowest common on notify
2015-06-23 17:36:26 +02:00
Fabrixxm
a3cd16bd9f
remove localized htconfig templates
2015-06-23 12:35:51 +02:00
Fabrixxm
d06beb1431
install: load htconfig template from templates/
2015-06-23 12:35:51 +02:00
5549dd1dbe
Merge pull request #1682 from fabrixxm/issue-1625
...
admin: allow deletion of any users but yourself
2015-06-23 11:05:16 +02:00
Fabrixxm
3168b44317
admin: allow deletion of any users but yourself
...
fix #1625
2015-06-23 10:39:28 +02:00
Fabrixxm
53e6dd6637
Add contact detail to contact drop confirm
...
fix #1629
2015-06-23 10:09:27 +02:00
