friendica
a163825291
redir links for permission controlled attachments
2012-05-21 22:54:39 -07:00
Simon
2320a3e549
Merge pull request #308 from simonlnu/master
...
fix (mini-)search-text text
2012-05-21 18:39:50 -07:00
Simon L'nu
d466c9ab08
fix (min-)search-text text
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:38:53 -04:00
Simon
c95eb69997
Merge pull request #307 from simonlnu/master
...
updates to dispy family; fix typo in INSTALL.txt
2012-05-21 18:30:36 -07:00
Simon L'nu
bd3c0edf34
updates to dispy family; fix typo in INSTALL.txt
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 21:29:18 -04:00
Simon L'nu
867e3b33d1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
* master:
2012-05-21 21:23:40 -04:00
friendica
9ca3ac6e61
Merge https://github.com/friendica/friendica into pull
2012-05-21 16:43:07 -07:00
friendica
54e2c1ca81
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
2012-05-21 16:40:11 -07:00
Simon L'nu
f570965ebe
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-21 06:50:00 -04:00
Simon
997d88b449
Merge pull request #306 from simonlnu/master
...
more light fixes
2012-05-21 03:49:46 -07:00
Simon L'nu
627367e1ee
more light fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 06:48:08 -04:00
Simon
f982a8b3e5
Merge pull request #305 from simonlnu/master
...
fix dumb mistake in light
2012-05-20 23:49:59 -07:00
Simon L'nu
cb2702249f
fix dumb mistake in light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-21 02:47:43 -04:00
Simon L'nu
f65d8e50be
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
* master:
2012-05-21 00:36:38 -04:00
friendica
71fe343324
Merge https://github.com/friendica/friendica into pull
2012-05-20 18:30:52 -07:00
friendica
afaf9ec74f
rev update
2012-05-20 18:30:02 -07:00
Simon
34423e4b32
Merge pull request #303 from simonlnu/master
...
fix brown paper bag with dispy light
2012-05-20 11:38:25 -07:00
Simon L'nu
2ac55c9f21
fix dispy light
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-20 14:37:20 -04:00
Simon L'nu
18d4cf0583
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
search with leading @ performs directory search (# for tag search), nothing for text search
Darkzero-NS + 'Friendicaland' countries.
set comment permissions explicitly to parent permissions
* master:
2012-05-20 14:33:15 -04:00
zottel
2cd3ec7b98
Merge remote branch 'upstream/master'
2012-05-20 09:08:56 +02:00
friendica
f16a119940
search with leading @ performs directory search (# for tag search), nothing for text search
2012-05-19 21:53:27 -07:00
Thomas Willingham
c6104fb856
Darkzero-NS + 'Friendicaland' countries.
2012-05-20 01:44:07 +01:00
friendica
266512e801
Merge https://github.com/friendica/friendica into pull
2012-05-19 17:22:00 -07:00
friendica
dd86f40f96
set comment permissions explicitly to parent permissions
2012-05-19 16:42:24 -07:00
Simon L'nu
f48de79181
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
Darkzero, another missing part of "everything"
Diabook-dark - some more cleaning up
Okay, so maybe not *everything*
Give Darkzero some loving.
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 @
sql script to ccnvert all tables to innodb
* master:
2012-05-19 18:53:57 -04:00
Michael Vogel
8c80fe0bf5
Performance tests
2012-05-20 00:11:32 +02:00
Thomas Willingham
4484bd0e97
Darkzero, another missing part of "everything"
2012-05-19 17:30:55 +01:00
Thomas Willingham
b1c58511ad
Diabook-dark - some more cleaning up
2012-05-19 17:20:27 +01:00
Michael
6342b3e0bd
Merge branch 'master' of github.com:annando/friendica
2012-05-19 16:55:33 +02:00
Thomas Willingham
a1b96d11a7
Okay, so maybe not *everything*
2012-05-19 15:17:35 +01:00
Thomas Willingham
d6ca4a1b42
Give Darkzero some loving.
...
Everything that used to be hidden with light text on light backgrounds is legible now.
2012-05-19 14:51:10 +01:00
Michael Vogel
9a940786c1
Merge remote branch 'upstream/master'
2012-05-19 14:04:24 +02:00
friendica
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
friendica
a49bd0a686
Merge https://github.com/friendica/friendica into pull
2012-05-19 00:46:49 -07:00
friendica
668e03d4e5
sql script to ccnvert all tables to innodb
2012-05-19 00:45:45 -07:00
Simon
ec85825509
Merge pull request #302 from simonlnu/master
...
fix -desc again
2012-05-19 00:16:44 -07:00
Simon L'nu
4a35a51724
fix -desc again
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-19 03:15:35 -04:00
Simon L'nu
2cee9ec5c8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
profile change activity link bug
* master:
2012-05-19 02:59:40 -04:00
friendica
4133df6223
profile change activity link bug
2012-05-18 17:55:11 -07:00
Simon L'nu
83f0807e59
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
apply max-width to images in posts, duepuntozero
theming for default group selector
catch more places to apply default group
make it difficult to setup a private forum with no privacy
more private forums, default privacy group for new contacts
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
* master:
2012-05-18 12:12:40 -04:00
friendica
3821744450
apply max-width to images in posts, duepuntozero
2012-05-18 01:46:02 -07:00
friendica
34b79b4f2b
theming for default group selector
2012-05-18 01:38:11 -07:00
friendica
5ecaeb8e5c
catch more places to apply default group
2012-05-18 01:03:46 -07:00
friendica
1d157fc747
make it difficult to setup a private forum with no privacy
2012-05-17 23:05:41 -07:00
friendica
7b0ded3f14
more private forums, default privacy group for new contacts
2012-05-17 22:44:52 -07:00
Simon L'nu
c024c17b5f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
setup delivery chain for private groups (work in progress)
bring in the *much better* xml parser from the original zot branch
rev update
merged from wrong project
initial commit
* master:
2012-05-17 23:01:46 -04:00
friendica
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
friendica
d5d853f37f
setup delivery chain for private groups (work in progress)
2012-05-17 19:35:24 -07:00
friendica
4f0e26759c
bring in the *much better* xml parser from the original zot branch
2012-05-16 21:29:57 -07:00
zottel
764ac240a9
Merge remote branch 'upstream/master'
2012-05-17 01:24:37 +02:00
