This website requires JavaScript.
3ce06caeed
cause of bogus wall-to-wall posts found
2012-05-22 03:55:11 -07:00
f29f861d25
add queue totals to admin summary page
2012-05-22 03:44:03 -07:00
be64437b14
DE: update to the strings and some mail templates
2012-05-22 12:17:01 +02:00
30f3a16874
Merge branch 'master' of https://github.com/friendica/friendica
2012-05-22 11:57:19 +02:00
5dad99888d
fix setting array values to config items
2012-05-22 11:56:49 +02:00
e9c86c0fd0
Merge remote branch 'upstream/master'
2012-05-22 08:46:02 +02:00
02502c3a74
Merge https://github.com/friendica/friendica into pull
2012-05-21 22:56:39 -07:00
a163825291
redir links for permission controlled attachments
2012-05-21 22:54:39 -07:00
2320a3e549
Merge pull request #308 from simonlnu/master
2012-05-21 18:39:50 -07:00
d466c9ab08
fix (min-)search-text text
2012-05-21 21:38:53 -04:00
c95eb69997
Merge pull request #307 from simonlnu/master
2012-05-21 18:30:36 -07:00
bd3c0edf34
updates to dispy family; fix typo in INSTALL.txt
2012-05-21 21:29:18 -04:00
867e3b33d1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-21 21:23:40 -04:00
9ca3ac6e61
Merge https://github.com/friendica/friendica into pull
2012-05-21 16:43:07 -07:00
54e2c1ca81
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
2012-05-21 16:40:11 -07:00
f570965ebe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-21 06:50:00 -04:00
997d88b449
Merge pull request #306 from simonlnu/master
2012-05-21 03:49:46 -07:00
627367e1ee
more light fixes
2012-05-21 06:48:08 -04:00
f982a8b3e5
Merge pull request #305 from simonlnu/master
2012-05-20 23:49:59 -07:00
cb2702249f
fix dumb mistake in light
2012-05-21 02:47:43 -04:00
f65d8e50be
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-21 00:36:38 -04:00
71fe343324
Merge https://github.com/friendica/friendica into pull
2012-05-20 18:30:52 -07:00
afaf9ec74f
rev update
2012-05-20 18:30:02 -07:00
34423e4b32
Merge pull request #303 from simonlnu/master
2012-05-20 11:38:25 -07:00
2ac55c9f21
fix dispy light
2012-05-20 14:37:20 -04:00
18d4cf0583
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-20 14:33:15 -04:00
2cd3ec7b98
Merge remote branch 'upstream/master'
2012-05-20 09:08:56 +02:00
f16a119940
search with leading @ performs directory search (# for tag search), nothing for text search
2012-05-19 21:53:27 -07:00
c6104fb856
Darkzero-NS + 'Friendicaland' countries.
2012-05-20 01:44:07 +01:00
266512e801
Merge https://github.com/friendica/friendica into pull
2012-05-19 17:22:00 -07:00
dd86f40f96
set comment permissions explicitly to parent permissions
2012-05-19 16:42:24 -07:00
f48de79181
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-19 18:53:57 -04:00
8c80fe0bf5
Performance tests
2012-05-20 00:11:32 +02:00
4484bd0e97
Darkzero, another missing part of "everything"
2012-05-19 17:30:55 +01:00
b1c58511ad
Diabook-dark - some more cleaning up
2012-05-19 17:20:27 +01:00
6342b3e0bd
Merge branch 'master' of github.com:annando/friendica
2012-05-19 16:55:33 +02:00
a1b96d11a7
Okay, so maybe not *everything*
2012-05-19 15:17:35 +01:00
d6ca4a1b42
Give Darkzero some loving.
2012-05-19 14:51:10 +01:00
9a940786c1
Merge remote branch 'upstream/master'
2012-05-19 14:04:24 +02:00
513ef2410d
backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
2012-05-19 02:42:11 -07:00
a49bd0a686
Merge https://github.com/friendica/friendica into pull
2012-05-19 00:46:49 -07:00
668e03d4e5
sql script to ccnvert all tables to innodb
2012-05-19 00:45:45 -07:00
ec85825509
Merge pull request #302 from simonlnu/master
2012-05-19 00:16:44 -07:00
4a35a51724
fix -desc again
2012-05-19 03:15:35 -04:00
2cee9ec5c8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-19 02:59:40 -04:00
4133df6223
profile change activity link bug
2012-05-18 17:55:11 -07:00
83f0807e59
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-18 12:12:40 -04:00
3821744450
apply max-width to images in posts, duepuntozero
2012-05-18 01:46:02 -07:00
34b79b4f2b
theming for default group selector
2012-05-18 01:38:11 -07:00
5ecaeb8e5c
catch more places to apply default group
2012-05-18 01:03:46 -07:00
1d157fc747
make it difficult to setup a private forum with no privacy
2012-05-17 23:05:41 -07:00
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
c024c17b5f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-17 23:01:46 -04:00
7cfa7a7671
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work
2012-05-17 19:59:46 -07:00
d5d853f37f
setup delivery chain for private groups (work in progress)
2012-05-17 19:35:24 -07:00
4f0e26759c
bring in the *much better* xml parser from the original zot branch
2012-05-16 21:29:57 -07:00
764ac240a9
Merge remote branch 'upstream/master'
2012-05-17 01:24:37 +02:00
f5f345d388
Merge https://github.com/friendica/friendica into pull
2012-05-16 13:55:00 -07:00
6744b5975c
rev update
2012-05-16 13:52:11 -07:00
296c84d822
Merge pull request #301 from simonlnu/master
2012-05-16 10:34:30 -07:00
331013f281
fix admin links...
2012-05-16 13:33:20 -04:00
d6add82b32
merged from wrong project
2012-05-16 05:08:15 -07:00
18f638c93e
Merge https://github.com/friendica/friendica into pull
2012-05-16 04:59:15 -07:00
becfe1f6f7
Merge pull request #300 from simonlnu/master
2012-05-16 02:52:35 -07:00
a8a3732f05
*sigh*. fix dark *again*
2012-05-16 05:51:29 -04:00
423864dc23
Merge pull request #299 from simonlnu/master
2012-05-16 02:33:10 -07:00
7eb73bc600
get rid of the monstrosity for .button. need to find alternate solution
2012-05-16 05:32:08 -04:00
2d6c6255f9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-16 05:29:34 -04:00
f2c0c40f6e
Merge remote branch 'upstream/master'
2012-05-16 08:24:46 +02:00
1900f4dd5b
Merge https://github.com/friendica/friendica into pull
2012-05-15 23:15:29 -07:00
2b8c4df544
Merge branch 'master' of github.com:annando/friendica
2012-05-16 08:10:28 +02:00
a65bd73bf3
Merge pull request #298 from simonlnu/master
2012-05-15 23:01:20 -07:00
fca09c9d4c
slight re-design of wall stuff and css/font cleaning
2012-05-16 01:58:55 -04:00
1872cf2b2d
Merge https://github.com/friendica/dir into dpull
2012-05-15 22:30:47 -07:00
a3137eec11
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-15 23:40:35 -04:00
e39014a3a7
update tinymce to 3.5.0.1
2012-05-15 17:18:46 -07:00
205c09e4f0
rev update
2012-05-15 17:05:28 -07:00
1a1d950eb4
initial commit
2012-05-15 05:09:26 -07:00
68dc7c3568
DE strings
2012-05-15 10:44:01 +02:00
e9aeafbe13
Merge remote branch 'upstream/master'
2012-05-15 08:45:19 +02:00
0faa0c2ab1
slackr drop shadows extended
2012-05-14 21:45:37 -07:00
c53674d367
Merge https://github.com/friendica/friendica into pull
2012-05-14 20:36:27 -07:00
bd32693a90
Merge pull request #297 from mexon/upstream
2012-05-14 18:57:55 -07:00
e574514e21
Allow plugins to modify the contact photo menu
2012-05-13 10:15:54 +02:00
2b471d6df3
rev update
2012-05-14 16:32:21 -07:00
2687f4377c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-14 19:29:06 -04:00
584b15aaec
Merge remote branch 'upstream/master'
2012-05-14 13:59:37 +02:00
59aefd9346
Merge pull request #296 from simonlnu/master
2012-05-13 21:33:07 -07:00
db5fe14241
finish dipsy light colour fixes
2012-05-14 00:30:25 -04:00
fcf6d10efd
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-14 00:26:34 -04:00
c12ec1116b
Merge https://github.com/friendica/friendica into pull
2012-05-13 16:40:46 -07:00
2bd4ff5705
rev update
2012-05-13 16:40:02 -07:00
39c042f4ea
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-13 18:50:04 -04:00
303856ce01
diabook-theme: small fixes
2012-05-13 20:51:39 +02:00
3811fe288f
rename get_language() to get_browser_language()
2012-05-13 04:52:29 -07:00
eaf028c9fb
Merge https://github.com/friendica/friendica into pull
2012-05-12 22:20:03 -07:00
e7813f22af
slackr drop shadows
2012-05-12 22:19:29 -07:00
f267a283b4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-12 18:56:13 -04:00
b506c6f073
Merge pull request #295 from simonlnu/master
2012-05-12 15:55:37 -07:00
93dc96e2cf
css fixes; new screenshots
2012-05-12 18:53:01 -04:00
friendica
Tobias Diekershoff
zottel
Simon
Simon L'nu
Thomas Willingham
Michael Vogel
Matthew Exon
tommy tomson