friendica
e36b1ed3d7
Merge branch 'pull'
2012-03-30 04:53:49 -07:00
friendica
32b346f5f1
string update
2012-03-30 04:53:00 -07:00
tomtom84
0bee09350d
Merge pull request #187 from tomtom84/master
...
add themes diabook-red & diabook-aerith
2012-03-30 04:51:51 -07:00
tommy tomson
5ced7f2bc5
add themes diabook-red & diabook-aerith
2012-03-30 13:48:34 +02:00
friendica
bcc5801608
rename "file as" to "save to folder"
2012-03-30 02:42:36 -07:00
friendica
6f761e9d59
Merge branch 'pull'
2012-03-30 02:24:14 -07:00
friendica
87539dbec4
bug #352 - qcomment plugin disabled, qcomments still allowed
2012-03-30 02:22:57 -07:00
Tobias Diekershoff
d22b3a1d9c
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-30 08:12:28 +02:00
Tobias Diekershoff
e2370b56bf
quattro-greey: apply theming to private mail
2012-03-30 08:10:49 +02:00
friendica
d83bfd464b
zrl into people searches
2012-03-29 22:20:14 -07:00
friendica
e2c295c01f
another silly mistake
2012-03-29 21:44:30 -07:00
friendica
9332312ce9
silly mistake
2012-03-29 21:18:47 -07:00
friendica
168cf3b9d4
zrl on mentions
2012-03-29 21:08:10 -07:00
friendica
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
friendica
cd47ba6ed1
Merge branch 'pull'
2012-03-29 18:23:34 -07:00
friendica
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
Simon
1326c1388e
Merge pull request #186 from simonlnu/master
...
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
2012-03-29 17:21:06 -07:00
Simon L'nu
3b4016168d
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-29 20:19:43 -04:00
Simon L'nu
fe1e384a51
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
typo in function name
* master:
2012-03-29 20:16:49 -04:00
friendica
5921dc6f16
typo in function name
2012-03-29 16:01:44 -07:00
Simon L'nu
e7b920c273
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
theme file_as combobox for 2.0
css fixes in diabook-derivates
quattro: style pm pages
message: remove tabs, move new message link to aside, all message with gmail-style
quattro: tpl for "file as"
* master:
2012-03-29 12:30:13 -04:00
friendica
e935b3a225
theme file_as combobox for 2.0
2012-03-29 04:07:16 -07:00
tommy tomson
339c8a4b56
css fixes in diabook-derivates
2012-03-29 11:02:59 +02:00
fabrixxm
3ee529d095
Merge pull request #185 from fabrixxm/master
...
Updated private message pages
2012-03-28 23:47:23 -07:00
Simon L'nu
f2e2632810
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
some reported warnings cleaned up
network permission ids
wrong var for notify total
fix notification total
improved rw notifications
bug #349 - email notls setting
add a searchbox to "find friends" for global search
bugfix in diabook
title not updated when editing post
New parameter in html2plain for plain text exports. More compatibility in API
API: added max_id
API: Now threading seems to work
API: Seesmic is now working. Optimizing text export.
Quotes with author are now having an "open/close" link
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
* master:
2012-03-29 00:04:00 -04:00
friendica
4e4f7ac79f
some reported warnings cleaned up
2012-03-28 20:50:09 -07:00
friendica
a946b7cea3
Merge branch 'pull'
2012-03-28 19:57:28 -07:00
friendica
60fe74ce97
network permission ids
2012-03-28 19:56:14 -07:00
friendica
3f89adfd62
wrong var for notify total
2012-03-28 17:51:43 -07:00
friendica
77715c0c65
fix notification total
2012-03-28 17:44:24 -07:00
friendica
7956c2d08e
improved rw notifications
2012-03-28 17:21:56 -07:00
friendica
75f3d41da2
Merge pull request #184 from annando/master
...
Enhancing the API - Preparations for a better facebook export
2012-03-28 15:08:15 -07:00
friendica
a2b1aca27c
Merge branch 'pull'
2012-03-28 14:55:06 -07:00
friendica
4fe0b56d76
bug #349 - email notls setting
2012-03-28 14:54:00 -07:00
tommy tomson
aa26517cdc
add a searchbox to "find friends" for global search
2012-03-28 23:07:34 +02:00
tommy tomson
1a9bbac0be
bugfix in diabook
2012-03-28 20:45:39 +02:00
Michael Vogel
bdd2754740
Merge commit 'upstream/master'
2012-03-28 19:52:30 +02:00
Fabio Comuni
011a96d960
quattro: style pm pages
2012-03-28 15:34:02 +02:00
Fabio Comuni
50711040cb
message: remove tabs, move new message link to aside, all message with gmail-style
2012-03-28 15:31:58 +02:00
Fabio Comuni
f86e909a82
Merge remote-tracking branch 'friendica/master'
2012-03-28 15:21:01 +02:00
friendica
e894775a39
Merge branch 'pull'
2012-03-28 05:16:25 -07:00
Fabio Comuni
0f2a34c23b
quattro: tpl for "file as"
2012-03-28 13:37:04 +02:00
Simon
3db94d5212
Merge pull request #183 from simonlnu/master
...
final pull req for now. really fixed.
2012-03-28 03:49:10 -07:00
Simon L'nu
57ef21295a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
viewsrc: return only body if page is requested via ajax
* master:
2012-03-28 06:48:05 -04:00
Simon L'nu
4a75ea2f42
really fix it this time...
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:47:38 -04:00
fabrixxm
77aeba0d12
Merge pull request #182 from fabrixxm/master
...
viewsrc returns only text if page is requested via ajax
2012-03-28 03:46:29 -07:00
Simon
8c95332753
Merge pull request #181 from simonlnu/master
...
how the default.php gets read just changed from under me. not pleasant.
2012-03-28 03:21:34 -07:00
Simon L'nu
3d5e711780
WITH is going on?
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-28 06:20:13 -04:00
friendica
b58dc43148
Merge branch 'pull'
2012-03-28 03:19:42 -07:00
friendica
b18086097e
title not updated when editing post
2012-03-28 03:18:26 -07:00
