aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* import quattro event reminderfriendica2012-05-222-0/+40
|
* mark bubbles unsupportedfriendica2012-05-222-0/+0
|
* keep FB out of private notesfriendica2012-05-224-16/+25
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-222-4/+8
|\
| * Oops - but lets commit the right revision, sorry. There's a spare line in ↵Thomas Willingham2012-05-221-6/+1
| | | | | | | | the last one.
| * Fix darkzero/ns BB icon background colours.Thomas Willingham2012-05-222-4/+13
| |
* | clear submanage, etc from session on logoutfriendica2012-05-221-0/+7
| |
* | if identity (uid) changes - reload any other open browser windows on next ping.friendica2012-05-225-249/+267
|/
* cause of bogus wall-to-wall posts foundfriendica2012-05-221-1/+1
|
* add queue totals to admin summary pagefriendica2012-05-222-1/+18
|
* DE: update to the strings and some mail templatesTobias Diekershoff2012-05-224-483/+535
|
* Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-05-224-27/+30
|\
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-219-213/+227
| |\
| * | redir links for permission controlled attachmentsfriendica2012-05-214-27/+30
| | |
* | | fix setting array values to config itemsTobias Diekershoff2012-05-221-3/+1
| |/ |/|
* | Merge pull request #308 from simonlnu/masterSimon2012-05-212-2/+2
|\ \ | | | | | | fix (mini-)search-text text
| * | fix (min-)search-text textSimon L'nu2012-05-212-2/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* | | Merge pull request #307 from simonlnu/masterSimon2012-05-219-212/+226
|\| | | |/ |/| updates to dispy family; fix typo in INSTALL.txt
| * updates to dispy family; fix typo in INSTALL.txtSimon L'nu2012-05-219-212/+226
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2111-66/+205
| |\ | |/ |/| | | | | | | | | * remotes/upstream/master: rev update, bug 428, 429, and ability to block globaldir submissions from demo sites * master:
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-212-8/+8
|\ \
* | | rev update, bug 428, 429, and ability to block globaldir submissions from ↵friendica2012-05-2111-66/+205
| | | | | | | | | | | | demo sites
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-210-0/+0
| |/ | | | | | | | | | | * remotes/upstream/master: * master:
| * Merge pull request #306 from simonlnu/masterSimon2012-05-212-2/+2
| |\ | | | | | | more light fixes
| | * more light fixesSimon L'nu2012-05-212-2/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | Merge pull request #305 from simonlnu/masterSimon2012-05-202-6/+6
|/| | | |/ | | fix dumb mistake in light
| * fix dumb mistake in lightSimon L'nu2012-05-212-6/+6
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-210-0/+0
|/ | | | | | | * remotes/upstream/master: rev update * master:
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-202-2/+2
|\
| * Merge pull request #303 from simonlnu/masterSimon2012-05-202-2/+2
| |\ | | | | | | fix brown paper bag with dispy light
| | * fix dispy lightSimon L'nu2012-05-202-2/+2
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-207-33/+126
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | * 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:
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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:
* | | rev updatefriendica2012-05-208-135/+158
|/ /
* | search with leading @ performs directory search (# for tag search), nothing ↵friendica2012-05-192-1/+8
| | | | | | | | for text search
* | Darkzero-NS + 'Friendicaland' countries.Thomas Willingham2012-05-202-12/+69
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-193-7/+35
|\|
| * Darkzero, another missing part of "everything"Thomas Willingham2012-05-191-0/+1
| |
| * Diabook-dark - some more cleaning upThomas Willingham2012-05-192-4/+5
| |
| * Okay, so maybe not *everything*Thomas Willingham2012-05-191-2/+11
| |
| * Give Darkzero some loving.Thomas Willingham2012-05-191-1/+18
| | | | | | | | Everything that used to be hidden with light text on light backgrounds is legible now.
* | set comment permissions explicitly to parent permissionsfriendica2012-05-193-20/+49
|/
* backend support for 'x' deliveries per process - x is configurable, more ↵friendica2012-05-193-377/+394
| | | | importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-194-5/+5
|\
| * Merge pull request #302 from simonlnu/masterSimon2012-05-194-5/+5
| |\ | | | | | | fix -desc again
| | * fix -desc againSimon L'nu2012-05-194-5/+5
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-193-246/+266
| | |\ | | |/ | |/| | | | | | | | | | | | | * remotes/upstream/master: profile change activity link bug * master:
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1816-40/+183
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-170-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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:
* | | | sql script to ccnvert all tables to innodbfriendica2012-05-191-0/+19
|/ / /