This website requires JavaScript.
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
4bf2a7bf50
Merge pull request #194 from simonlnu/master
2012-04-01 00:58:08 -07:00
db7f7e4237
latest fixes for dispys. tweaking/repairing
2012-04-01 03:57:05 -04:00
bbd86382a6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-01 03:54:58 -04:00
e97d90820d
line 86: s/Friendika/Friendica/
2012-04-01 04:52:45 -03:00
ea10bba147
fix "between yourself and You" in mail list
2012-03-31 20:08:32 -07:00
ed8c5954a9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-31 22:46:13 -04:00
e6fd6bfd89
more error handling
2012-03-31 17:44:34 -07:00
2147e0a71f
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
2012-03-31 16:08:40 -07:00
53f799f2bc
handle escaped file chars in display and search
2012-03-31 15:25:17 -07:00
7581b32bb3
Merge branch 'pull'
2012-03-31 14:50:14 -07:00
0cf2e051bb
escape % in file_tag_query as it is ultimately embedded in a sprintf
2012-03-31 14:48:35 -07:00
05ad28fb9b
Merge pull request #193 from tomtom84/master
2012-03-31 09:44:12 -07:00
36545e554b
diabook-themes: move "common tabs" to left side on settings page
2012-03-31 18:42:11 +02:00
19a7096be6
Merge pull request #192 from tomtom84/master
2012-03-31 08:00:45 -07:00
13ded12ffb
move the common tabs to right_aside in diabook-derivates
2012-03-31 16:58:02 +02:00
59b45f7fc1
Several improvements
2012-03-31 16:28:39 +02:00
adebc2793e
register hooks for a COPA plugin
2012-03-31 06:15:33 -07:00
c34a71eba6
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
2012-03-31 05:51:56 -07:00
d5a31e5791
Merge branch 'pull'
2012-03-31 04:40:35 -07:00
893ece9066
bug fix in diabook-aerith and -red
2012-03-31 11:50:33 +02:00
ee9a3eb163
Merge pull request #191 from tomtom84/master
2012-03-31 02:11:30 -07:00
0b41654935
bug-fixes in diabook-derivates
2012-03-31 11:09:57 +02:00
6b086cd266
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-31 04:05:19 -04:00
3d2bcaa5fc
Merge pull request #190 from simonlnu/master
2012-03-31 01:03:39 -07:00
f5e3ec9a56
forgot the css changes for last push
2012-03-31 04:02:51 -04:00
b4b1055b50
settings for unknown private mail acceptance
2012-03-31 00:57:59 -07:00
ee95c12a24
Merge pull request #189 from simonlnu/master
2012-03-31 00:57:26 -07:00
b88a452c6b
theme fixes; fix qcomment (finally)
2012-03-31 03:56:06 -04:00
e940acf8c6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-31 03:42:19 -04:00
8c928e67ba
warning cleanup
2012-03-30 23:18:46 -07:00
301527e5a2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-30 19:48:15 -04:00
f39e812677
Merge remote branch 'upstream/master'
2012-03-31 00:30:34 +02:00
aace55df0a
Merge branch 'pull'
2012-03-30 15:12:20 -07:00
cfdfcb37cb
don't delete contact from a friend request if friendship was already established
2012-03-30 15:10:50 -07:00
007d67a998
Merge pull request #188 from fabrixxm/master
2012-03-30 14:58:44 -07:00
be2005f146
quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme.
2012-03-30 21:21:14 +02:00
01af7d355a
allow themes to use "style.php" instead of "style.css". Load style.php trhu mod/view.php to pass it friendica framework.
2012-03-30 21:18:25 +02:00
77f57e1b13
Merge remote-tracking branch 'friendica/master'
2012-03-30 19:37:43 +02:00
f50fb7d6ca
css-fixes in diabook-derivates
2012-03-30 17:52:29 +02:00
24e7a3413c
quattro-green: remove settings code Use config.php from quattro
2012-03-30 15:46:14 +02:00
db59a45030
quattro: add config.php
2012-03-30 15:45:23 +02:00
054d21a2e8
settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
6d3d882f9b
css-fixes in diabook-derivates
2012-03-30 16:33:34 +02:00
17c908973f
catch OpenID login errors in cases when the OpenID server does not answers
2012-03-30 15:19:17 +02:00
5b4bb347a6
css-fixes in diabook-derivates
2012-03-30 14:38:21 +02:00
8685a91742
quattro-green: added Description to the theme.php
2012-03-30 14:24:45 +02:00
c5cb208cb8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-30 08:17:40 -04:00
b5e292509e
quattro-green: adopted quattro option for centered display
2012-03-30 14:03:33 +02:00
e36b1ed3d7
Merge branch 'pull'
2012-03-30 04:53:49 -07:00
32b346f5f1
string update
2012-03-30 04:53:00 -07:00
0bee09350d
Merge pull request #187 from tomtom84/master
2012-03-30 04:51:51 -07:00
5ced7f2bc5
add themes diabook-red & diabook-aerith
2012-03-30 13:48:34 +02:00
bcc5801608
rename "file as" to "save to folder"
2012-03-30 02:42:36 -07:00
6f761e9d59
Merge branch 'pull'
2012-03-30 02:24:14 -07:00
87539dbec4
bug #352 - qcomment plugin disabled, qcomments still allowed
2012-03-30 02:22:57 -07:00
2212e69310
Merge remote branch 'upstream/master'
2012-03-30 09:03:43 +02:00
d22b3a1d9c
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-30 08:12:28 +02:00
e2370b56bf
quattro-greey: apply theming to private mail
2012-03-30 08:10:49 +02:00
d83bfd464b
zrl into people searches
2012-03-29 22:20:14 -07:00
e2c295c01f
another silly mistake
2012-03-29 21:44:30 -07:00
9332312ce9
silly mistake
2012-03-29 21:18:47 -07:00
168cf3b9d4
zrl on mentions
2012-03-29 21:08:10 -07:00
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
cd47ba6ed1
Merge branch 'pull'
2012-03-29 18:23:34 -07:00
75f778a504
provide a way to specify an admin account for siteinfo if more than one have admin email address
2012-03-29 18:22:20 -07:00
1326c1388e
Merge pull request #186 from simonlnu/master
2012-03-29 17:21:06 -07:00
3b4016168d
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
2012-03-29 20:19:43 -04:00
fe1e384a51
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-29 20:16:49 -04:00
5921dc6f16
typo in function name
2012-03-29 16:01:44 -07:00
e7b920c273
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-29 12:30:13 -04:00
e935b3a225
theme file_as combobox for 2.0
2012-03-29 04:07:16 -07:00
339c8a4b56
css fixes in diabook-derivates
2012-03-29 11:02:59 +02:00
953840cf82
Merge remote branch 'upstream/master'
2012-03-29 10:23:45 +02:00
3ee529d095
Merge pull request #185 from fabrixxm/master
2012-03-28 23:47:23 -07:00
f2e2632810
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-29 00:04:00 -04:00
4e4f7ac79f
some reported warnings cleaned up
2012-03-28 20:50:09 -07:00
a946b7cea3
Merge branch 'pull'
2012-03-28 19:57:28 -07:00
60fe74ce97
network permission ids
2012-03-28 19:56:14 -07:00
3f89adfd62
wrong var for notify total
2012-03-28 17:51:43 -07:00
77715c0c65
fix notification total
2012-03-28 17:44:24 -07:00
7956c2d08e
improved rw notifications
2012-03-28 17:21:56 -07:00
75f3d41da2
Merge pull request #184 from annando/master
2012-03-28 15:08:15 -07:00
a2b1aca27c
Merge branch 'pull'
2012-03-28 14:55:06 -07:00
4fe0b56d76
bug #349 - email notls setting
2012-03-28 14:54:00 -07:00
aa26517cdc
add a searchbox to "find friends" for global search
2012-03-28 23:07:34 +02:00
1a9bbac0be
bugfix in diabook
2012-03-28 20:45:39 +02:00
bdd2754740
Merge commit 'upstream/master'
2012-03-28 19:52:30 +02:00
011a96d960
quattro: style pm pages
2012-03-28 15:34:02 +02:00
50711040cb
message: remove tabs, move new message link to aside, all message with gmail-style
2012-03-28 15:31:58 +02:00
f86e909a82
Merge remote-tracking branch 'friendica/master'
2012-03-28 15:21:01 +02:00
e894775a39
Merge branch 'pull'
2012-03-28 05:16:25 -07:00
0f2a34c23b
quattro: tpl for "file as"
2012-03-28 13:37:04 +02:00
3db94d5212
Merge pull request #183 from simonlnu/master
2012-03-28 03:49:10 -07:00
57ef21295a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-28 06:48:05 -04:00
4a75ea2f42
really fix it this time...
2012-03-28 06:47:38 -04:00
77aeba0d12
Merge pull request #182 from fabrixxm/master
2012-03-28 03:46:29 -07:00
8c95332753
Merge pull request #181 from simonlnu/master
2012-03-28 03:21:34 -07:00
3d5e711780
WITH is going on?
2012-03-28 06:20:13 -04:00
b58dc43148
Merge branch 'pull'
2012-03-28 03:19:42 -07:00
friendica
Simon
Simon L'nu
tomtom84
tommy tomson
Michael Vogel
zottel
Fabio Comuni
Tobias Diekershoff