aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Performance testsMichael Vogel2012-05-204-10/+19
|
* Merge remote branch 'upstream/master'Michael Vogel2012-05-1926-665/+1036
|\
| * 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
| |/ / /
| * | / profile change activity link bugfriendica2012-05-183-246/+266
| | |/ | |/|
| * | apply max-width to images in posts, duepuntozerofriendica2012-05-181-0/+5
| | |
| * | theming for default group selectorfriendica2012-05-184-4/+9
| | |
| * | catch more places to apply default groupfriendica2012-05-181-0/+10
| | |
| * | make it difficult to setup a private forum with no privacyfriendica2012-05-171-4/+13
| | |
| * | more private forums, default privacy group for new contactsfriendica2012-05-1713-34/+131
| | |
| * | tell browser not to cache permission denied (private) photos so that after ↵friendica2012-05-172-5/+22
| |/ | | | | | | authenticating we don't have to fight the browser - plus more prvgroup work
| * setup delivery chain for private groups (work in progress)friendica2012-05-173-24/+29
| |
| * bring in the *much better* xml parser from the original zot branchfriendica2012-05-161-0/+164
| |
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-162-2/+2
| |\
| | * Merge pull request #301 from simonlnu/masterSimon2012-05-162-2/+2
| | |\ | | | | | | | | fix admin links
| | | * fix admin links...Simon L'nu2012-05-162-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | rev updatefriendica2012-05-162-3/+3
| |/ /
| * | merged from wrong projectfriendica2012-05-161-4/+0
| | |
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-164-18/+21
| |\ \
| | * | Merge pull request #300 from simonlnu/masterSimon2012-05-162-2/+2
| | |\| | | | | | | | | *sigh*. fix dark *again*
| | | * *sigh*. fix dark *again*Simon L'nu2012-05-162-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge pull request #299 from simonlnu/masterSimon2012-05-164-16/+19
| | |\| | | | | | | | | get rid of the monstrosity for .button. need to find alternate solution
| | | * get rid of the monstrosity for .button. need to find alternate solutionSimon L'nu2012-05-164-16/+19
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-160-0/+0
| | |/ | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-157-83/+154
| |\|
| * | Merge https://github.com/friendica/dir into dpullfriendica2012-05-151-0/+4
| |\ \
| | * | initial commitfriendica2012-05-151-0/+4
| | /
* | | Merge remote branch 'upstream/master'Michael Vogel2012-05-16109-12544/+17543
|\ \ \ | | |/ | |/|
| * | Merge pull request #298 from simonlnu/masterSimon2012-05-157-83/+154
| |\ \ | | |/ | |/| slight re-design of wall stuff and css/font cleaning
| | * slight re-design of wall stuff and css/font cleaningSimon L'nu2012-05-167-83/+154
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-1532-5273/+6292
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: update tinymce to 3.5.0.1 rev update DE strings slackr drop shadows extended Allow plugins to modify the contact photo menu rev update * master:
| * | update tinymce to 3.5.0.1friendica2012-05-1526-4805/+5696
| | |
| * | rev updatefriendica2012-05-152-22/+30
| | |
| * | DE stringsTobias Diekershoff2012-05-152-400/+506
| | |
| * | slackr drop shadows extendedfriendica2012-05-141-1/+15
| | |
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-05-146-192/+215
| |\ \
| | * \ Merge pull request #297 from mexon/upstreamfriendica2012-05-141-1/+1
| | |\ \ | | | | | | | | | | Allow plugins to modify the contact photo menu
| | | * | Allow plugins to modify the contact photo menuMatthew Exon2012-05-151-1/+1
| | | | |
| * | | | rev updatefriendica2012-05-142-47/+47
| | | | |
| | | | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-140-0/+0
| | | |/ | | |/| | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| | * | Merge pull request #296 from simonlnu/masterSimon2012-05-135-191/+214
| |/| | | | | | | | | | finish dispy light colour fixes
| | * | finish dipsy light colour fixesSimon L'nu2012-05-145-191/+214
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-142-67/+67
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update * master:
| * | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-132-18/+24
| |\ \ \ | | | |/ | | |/|