Michael Vogel
|
8eedebfee3
|
Cleaning up some changes from the merge
|
2014-01-05 16:28:42 +01:00 |
|
Michael Vogel
|
aed28a24f1
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/crepair.php
|
2014-01-05 16:22:42 +01:00 |
|
Michael Vogel
|
28df35052a
|
Send notifications for each new post of a contact, option for creating a summary for a feed post
|
2014-01-05 16:10:02 +01:00 |
|
fabrixxm
|
b0e8dbc4da
|
Merge pull request #864 from fabrixxm/acl_automention
Acl automention
|
2014-01-03 06:09:12 -08:00 |
|
fabrixxm
|
ad5a47aecf
|
add fetaure switch for acl-automention
|
2014-01-03 14:40:43 +01:00 |
|
|
a5aa4bfbde
|
DE: update to the strings
|
2014-01-01 11:31:05 +01:00 |
|
fabrixxm
|
7b5018fb76
|
Merge pull request #872 from annando/master
API: Supporting twidere, better supporting of the network field in the item table
|
2013-12-27 00:15:44 -08:00 |
|
Michael Vogel
|
4b0e370c4c
|
Better handling of the network field in the item table.
|
2013-12-27 01:58:21 +01:00 |
|
|
25d83f780d
|
only show the remote_self option if admin allows it
|
2013-12-22 19:30:09 +01:00 |
|
|
f515def280
|
added remote_self as option to the contact repair dislog
|
2013-12-22 17:05:49 +01:00 |
|
|
22a6c72b31
|
added option to the admin panel to allow users to set the remote_self flag
|
2013-12-22 16:14:34 +01:00 |
|
|
f93a4e13b8
|
PL: update to the strings
|
2013-12-21 16:32:06 +01:00 |
|
Fabrixxm
|
9a94c35120
|
acl selector add and remove mentions when a forum is selected.
|
2013-12-18 10:18:26 -05:00 |
|
Fabrixxm
|
06e8f31695
|
change action container div class to id. fix bug in quattro theme
|
2013-12-18 06:38:57 -05:00 |
|
Fabrixxm
|
9febcedf93
|
user contacts: fix #797 , add searching in url and nickname, add batch actions
|
2013-12-17 05:19:06 -05:00 |
|
|
68e0324c1b
|
Merge pull request #853 from annando/master
Bugfix of the previous bugfix :)
|
2013-12-11 23:23:30 -08:00 |
|
Fabrixxm
|
9474a0deed
|
Add better support to small screen to duepuntozero theme.
This close #823. It also add some styles for screens less than 960px.
It's not a mobile theme, but should be better to see in case.
|
2013-12-11 05:25:41 -05:00 |
|
Michael Vogel
|
d487cb2078
|
vier: Screenshot updated
|
2013-12-10 20:56:50 +01:00 |
|
Michael Vogel
|
bae844e367
|
New style for shared links. Preparation for changes in some addons
|
2013-12-08 16:49:07 +01:00 |
|
Michael Vogel
|
3e5b9e97e7
|
New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.
|
2013-12-04 23:46:51 +01:00 |
|
|
acd29f22a0
|
Merge pull request #842 from annando/master
mail settings: inflate/deflate settings
|
2013-12-01 02:26:36 -08:00 |
|
Michael Vogel
|
9c2b1d39ea
|
mail settings: inflate/deflate settings
|
2013-11-30 21:32:44 +01:00 |
|
|
bd2f1f8cb0
|
Merge pull request #833 from tobiasd/adduserhint
add the hint also as a placeholder in the add contact form (issue #786)
|
2013-11-19 02:34:54 -08:00 |
|
|
32633d1534
|
PT-BR: update to the strings
|
2013-11-19 09:40:16 +01:00 |
|
|
dfc09f4ba1
|
DE: update to the strings
|
2013-11-19 09:39:54 +01:00 |
|
|
d4c56b227d
|
add the hint also as a placeholder in the add contact form (issue #786)
|
2013-11-17 16:09:44 +01:00 |
|
Fabrixxm
|
0414e0a316
|
More "relocate":
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
|
2013-11-13 06:07:49 -05:00 |
|
fabrixxm
|
15bb34caf0
|
Merge pull request #820 from maase2/patch-13
Update style.css
|
2013-11-11 01:49:37 -08:00 |
|
|
825ecad89d
|
CS: update to the strings
|
2013-11-08 19:43:03 +01:00 |
|
maase2
|
e010eb480e
|
Update style.css
Add warning-message class
|
2013-11-08 14:34:12 +01:00 |
|
|
c53b483293
|
DE: update to the strings
|
2013-11-07 10:53:47 +01:00 |
|
|
7d1a6cc1d6
|
Merge pull request #803 from annando/master
SQL performance and reduction of database warnings
|
2013-11-07 01:03:31 -08:00 |
|
|
d1a0206cdd
|
Merge pull request #806 from maase2/patch-6
Update style.css
|
2013-11-03 23:37:05 -08:00 |
|
maase2
|
50f69ff23e
|
Update style.css
This is for responsive Webdesign.
|
2013-11-03 11:27:49 +01:00 |
|
maase2
|
e6a81b47e0
|
Update style.css
This will fix the profile selector. It will be bring it on the left side.
|
2013-11-03 10:57:58 +01:00 |
|
Michael Vogel
|
711972a166
|
Merge remote-tracking branch 'upstream/master'
|
2013-10-25 23:35:03 +02:00 |
|
Michael Vogel
|
0ffeb4cf92
|
New field "network" in item table to speed up the system.
|
2013-10-25 23:33:53 +02:00 |
|
Michael Vogel
|
0cfeee2e47
|
Merge pull request #789 from tobiasd/20131020
added options to admin panel
|
2013-10-22 14:02:27 -07:00 |
|
Fabrixxm
|
0ccad6d7d2
|
quattro theme: version bump
|
2013-10-22 13:55:36 -04:00 |
|
Fabrixxm
|
900b90ad85
|
quattro theme update:
icon and notification for introductions
icon and notification for private messages
correct link to edit profile with single profile enabled
|
2013-10-22 13:53:12 -04:00 |
|
|
8faeee9965
|
added config->info and system-suppress_language options to the admin panel
|
2013-10-20 16:17:39 +02:00 |
|
|
c308bb9042
|
Merge pull request #788 from annando/master
Infinite scroll, "new share" is now standard
|
2013-10-20 06:04:25 -07:00 |
|
Michael Vogel
|
2e64802866
|
Merge remote-tracking branch 'upstream/master'
|
2013-10-20 13:01:24 +02:00 |
|
Michael Vogel
|
e70b110984
|
Switching from "new share" to "old share"
|
2013-10-15 00:49:49 +02:00 |
|
Michael Vogel
|
693b6d0fd4
|
Infinite scroll: At the end of the network page new content is loaded automatically
|
2013-10-15 00:43:11 +02:00 |
|
|
a2a12a429f
|
FR: update to the strings
|
2013-10-07 08:15:00 +02:00 |
|
|
8bd6858bfa
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2013-10-07 07:46:39 +02:00 |
|
Michael Vogel
|
8adc1bd703
|
Vier: Improved scrollbar when the "aside" area is to short.
|
2013-10-04 11:12:29 +02:00 |
|
Oliver
|
53040c0814
|
Update style.css
no opacity for remote-link icon
|
2013-09-24 09:18:29 +02:00 |
|
|
b178317cbb
|
Merge pull request #774 from silke/frost-mobile-share-link
Transferred link link from Neptune theme (by 23n) to frost-mobile
|
2013-09-23 21:36:47 -07:00 |
|