This website requires JavaScript.
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
b18086097e
title not updated when editing post
2012-03-28 03:18:26 -07:00
2a244be9ac
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-28 06:05:54 -04:00
c32ee4d226
Merge pull request #180 from simonlnu/master
2012-03-28 03:03:47 -07:00
356e654521
doh fix
2012-03-28 06:03:04 -04:00
768326e484
Merge pull request #179 from fabrixxm/master
2012-03-28 03:00:24 -07:00
40a65d38e0
Merge pull request #178 from simonlnu/master
2012-03-28 02:55:15 -07:00
bcf8a571f9
add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)
2012-03-28 05:52:28 -04:00
6bb8d42865
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-28 05:42:47 -04:00
767245e9ff
viewsrc: return only body if page is requested via ajax
2012-03-28 11:42:04 +02:00
0a2675d8b6
filer: replace "file as" prompt with combobox opened in fancybox
2012-03-28 10:49:34 +02:00
7aec2fd68d
filer: info() on item filed
2012-03-28 10:45:16 +02:00
82106632f0
template: field_combobox
2012-03-28 10:43:52 +02:00
7fc57f486f
support autocomplete @-tags in plaintext mode
2012-03-28 00:44:45 -07:00
f95fb2667a
vier navbar messed up after default theme template move
2012-03-28 00:16:22 -07:00
0aa99acd35
profile_tabs hook
2012-03-27 20:15:15 -07:00
7ee07daf04
use theme directory for page templates, not language directory
2012-03-27 18:39:52 -07:00
47eaa97af6
Merge branch 'pull'
2012-03-27 15:21:30 -07:00
aba63f8b78
turn on gecko spellcheck in tinymce
2012-03-27 15:20:36 -07:00
f30471df4f
small fix in diabook
2012-03-27 23:41:19 +02:00
211d00a1f5
fixes in diabook
2012-03-27 23:27:43 +02:00
0bf22d64f6
Merge pull request #177 from tomtom84/master
2012-03-27 10:05:32 -07:00
31fbc3fde3
provide a close-option for boxes in right_aside and store info via js and cookies
2012-03-27 19:02:07 +02:00
fef7790762
Merge pull request #176 from tomtom84/master
2012-03-27 06:32:30 -07:00
9fd54de691
provide a close-option for boxes in right_aside and store info via js and cookies
2012-03-27 15:29:46 +02:00
1982184ca0
Merge branch 'pull'
2012-03-27 04:52:39 -07:00
117d2165f5
form security error when using existing photo
2012-03-27 04:51:20 -07:00
fb817a29a9
Merge remote branch 'upstream/master'
2012-03-27 13:20:59 +02:00
928e6c7ef7
Merge pull request #175 from simonlnu/master
2012-03-27 01:43:01 -07:00
cc33a564e1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-27 04:40:42 -04:00
c3388ad813
more fixes for dispys
2012-03-27 04:40:31 -04:00
7c6c3d36f5
profile wall privacy
2012-03-27 01:31:47 -07:00
6cd56e0f33
add dispy-dark snapshot; fix toolbar
2012-03-27 03:57:47 -04:00
ed30635bee
Merge branch 'pull'
2012-03-27 00:55:25 -07:00
20f9733250
don't expire filed items
2012-03-27 00:54:34 -07:00
a57e1e9cbc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-27 03:23:50 -04:00
e7bc3f2bd0
add "find friends" to right_aside to diabook, fixes in css in diabook
2012-03-27 08:28:47 +02:00
b9d976e31b
fixed Umlaute in de strings.php
2012-03-27 07:18:20 +02:00
cfdb2979cb
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-27 00:54:47 -04:00
daa036e34c
@-completion bug
2012-03-26 21:48:04 -07:00
5275b5d049
qcomment enhancements
2012-03-26 20:13:03 -07:00
4c585f759f
theme description with preview (non-translatable unfortunately)
2012-03-26 18:15:10 -07:00
b5d0315d55
preparation for some possibly killer features
2012-03-26 17:57:27 -07:00
03b95c9a09
translate br with extra elements
2012-03-26 16:56:44 -07:00
70cc2fff6f
Merge branch 'pull'
2012-03-26 14:55:35 -07:00
7a1d044b21
revup
2012-03-26 14:54:30 -07:00
cc3617e286
Merge pull request #174 from beardy-unixer/master
2012-03-26 14:40:47 -07:00
ca8769e193
Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK.
2012-03-26 22:03:54 +01:00
286c230fa8
Merge remote-tracking branch 'main/master'
2012-03-26 20:17:01 +01:00
0a3f2bdd5b
Merge pull request #173 from simonlnu/master
2012-03-26 11:33:31 -07:00
3b9f0fd801
fix dispy's nav element; fix colours in #search-text
2012-03-26 14:19:59 -04:00
a0ee51b3db
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-03-26 14:18:39 -04:00
tomtom84
tommy tomson
friendica
zottel
Tobias Diekershoff
Simon
Simon L'nu
fabrixxm
Michael Vogel
Thomas Willingham