friendica
|
724e1d15d0
|
Merge https://github.com/friendica/friendica into pull
|
2012-04-22 16:25:02 -07:00 |
|
friendica
|
00cb7f9efb
|
don't allow non-existent themes as choices
|
2012-04-22 16:24:29 -07:00 |
|
friendica
|
c0dffa7442
|
Merge pull request #258 from unary/api
api: add support for StatusNet-style media param to API
|
2012-04-22 15:43:24 -07:00 |
|
Michael Johnston
|
76aa9b3037
|
api: add support for StatusNet-style media param to API
|
2012-04-22 13:37:25 -04:00 |
|
Tobias Hößl
|
27c23229c4
|
Merge branch 'master' of git://github.com/friendica/friendica
|
2012-04-22 13:31:07 +00:00 |
|
Tobias Hößl
|
3116db1a74
|
Add a hook
|
2012-04-22 13:28:54 +00:00 |
|
Fabio Comuni
|
3bb785fdad
|
Merge remote-tracking branch 'CatoTH/master' into req245
|
2012-04-20 09:25:51 +02:00 |
|
Fabio Comuni
|
fddf21d983
|
filebrowser: fix style, show 10 recent photos if not in an album
|
2012-04-18 15:15:52 +02:00 |
|
Fabio Comuni
|
0630120455
|
filebrowser: more style, load min and max scale photos
|
2012-04-18 14:56:03 +02:00 |
|
Fabio Comuni
|
e2e6b56c44
|
tinymce: add filebrowser for photos and attached files
|
2012-04-18 13:23:42 +02:00 |
|
Tobias Hößl
|
b885fedee1
|
XSRF protection and PHPdoc for mod/admin.php
|
2012-04-18 07:36:48 +00:00 |
|
Tobias Hößl
|
d7e750ad74
|
XSRF protection and PHPdoc for mod/admin.php
|
2012-04-18 07:24:47 +00:00 |
|
friendica
|
8269d6aa19
|
Merge pull request #240 from CatoTH/master
Some bugfixes / Notices
|
2012-04-17 06:50:09 -07:00 |
|
friendica
|
e6330e3b96
|
naked br appearing when attaching and textplain
|
2012-04-17 06:11:41 -07:00 |
|
Tobias Hößl
|
720c8324c7
|
Some Bugfixes, and variable checks
|
2012-04-17 11:33:50 +00:00 |
|
friendica
|
7ebca2b37d
|
rev update
|
2012-04-16 22:58:52 -07:00 |
|
friendica
|
93df525f5c
|
Merge pull request #238 from annando/master
API: Support of the statusnet application
|
2012-04-15 16:00:07 -07:00 |
|
friendica
|
0a3454c841
|
function name typo
|
2012-04-15 05:11:52 -07:00 |
|
friendica
|
0939029b74
|
track requested profile error msg
|
2012-04-14 14:45:09 -07:00 |
|
friendica
|
6af4183302
|
zrl on random profile
|
2012-04-14 05:07:00 -07:00 |
|
Michael Vogel
|
4e220ec391
|
Merge commit 'upstream/master'
|
2012-04-14 13:15:25 +02:00 |
|
friendica
|
0d869ceb65
|
pass zrl's to/through global directory
|
2012-04-14 03:51:41 -07:00 |
|
friendica
|
bfb821e918
|
well that was a silly mistake...
|
2012-04-13 16:12:06 -07:00 |
|
friendica
|
d1b57d6e74
|
setting wasn't being applied
|
2012-04-13 15:37:25 -07:00 |
|
Fabio Comuni
|
f6e1ddf7fb
|
Merge remote-tracking branch 'friendica/master'
|
2012-04-13 11:59:25 +02:00 |
|
Fabio Comuni
|
138a0e06b8
|
admin: change global theme settings
|
2012-04-13 11:20:05 +02:00 |
|
friendica
|
3c4e6d3461
|
bug #369 - show contacts who are not in any groups
|
2012-04-12 23:06:41 -07:00 |
|
friendica
|
af68d033e3
|
extended the "interesting" profile attributes
|
2012-04-12 21:58:15 -07:00 |
|
friendica
|
446e962bb8
|
send link directly to profile tab
|
2012-04-12 21:38:40 -07:00 |
|
friendica
|
2b339d5a6b
|
stray log statements
|
2012-04-12 21:21:35 -07:00 |
|
friendica
|
972c01edb3
|
profile change activities
|
2012-04-12 21:10:32 -07:00 |
|
friendica
|
32cd62ff0a
|
allow setting default new friend notify
|
2012-04-12 18:15:46 -07:00 |
|
friendica
|
7e2d4d4026
|
turn off new friend activity by default
|
2012-04-12 16:51:57 -07:00 |
|
Michael Vogel
|
572678fef9
|
Merge commit 'upstream/master'
Conflicts:
include/dba.php
|
2012-04-13 00:10:41 +02:00 |
|
friendica
|
60871555f5
|
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
|
2012-04-12 06:50:11 -07:00 |
|
Fabio Comuni
|
18ecac4e93
|
settings: remove call to profile_load()
|
2012-04-12 08:42:00 +02:00 |
|
Fabio Comuni
|
e992e29685
|
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
|
2012-04-12 08:38:55 +02:00 |
|
Michael Vogel
|
ee714daf4d
|
Merge commit 'upstream/master'
|
2012-04-11 19:35:51 +02:00 |
|
Michael Vogel
|
c88c2515e4
|
API: Improved the timeline. Several (disabled) tests with caching of photos.
|
2012-04-11 19:31:01 +02:00 |
|
friendica
|
967ed8e23f
|
Merge https://github.com/friendica/friendica into pull
|
2012-04-10 20:51:04 -07:00 |
|
friendica
|
b02a671494
|
visit "random profile" feature
|
2012-04-10 20:50:31 -07:00 |
|
Simon L'nu
|
75c7877986
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
* master:
|
2012-04-10 23:34:55 -04:00 |
|
Simon L'nu
|
2af41ee57b
|
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-04-10 23:34:39 -04:00 |
|
friendica
|
0fa932853c
|
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
|
2012-04-10 20:09:51 -07:00 |
|
friendica
|
19b636e7e8
|
more backend work on mail2 followers
|
2012-04-10 19:15:52 -07:00 |
|
friendica
|
ed608694ce
|
make editplain work everywhere
|
2012-04-10 18:08:06 -07:00 |
|
friendica
|
18e225b051
|
move all fix_mce to one function so it can easily be undone
|
2012-04-10 17:14:07 -07:00 |
|
friendica
|
ab46f95683
|
duplicate community posts
|
2012-04-10 16:59:30 -07:00 |
|
friendica
|
8f40e8546e
|
fix_mce_lf contact edit page
|
2012-04-10 16:32:38 -07:00 |
|
friendica
|
9b1bb53234
|
fix_mce_lf on profiles
|
2012-04-10 16:31:49 -07:00 |
|