aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into zpullfriendica2014-02-2414-997/+1051
|\
| * Merge pull request #337 from solstag/masterfriendica2014-02-2513-996/+1050
| |\
| | * Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago stringsAlexandre Hannud Abdo2014-02-243-23/+27
| | * Updates to pt-br translation, including some email templates.Alexandre Hannud Abdo2014-02-2410-973/+1023
| |/
| * Doco - just a friendicared => [baseurl]Thomas Willingham2014-02-241-1/+1
* | set theme for un-viewable profilefriendica2014-02-242-22/+33
|/
* Merge pull request #335 from beardy-unixer/masterfriendica2014-02-2440-1/+2509
|\
| * The string replacement missed that little blighter.Thomas Willingham2014-02-241-1/+1
| * Import doco from docs@friendicared.netThomas Willingham2014-02-2439-0/+2507
| * Make bbcode the default doco ready for the next commitThomas Willingham2014-02-241-1/+2
|/
* In case a page has overloaded a module, see if we already have a layout defin...friendica2014-02-232-2/+5
* Merge https://github.com/friendica/red into zpullfriendica2014-02-224-0/+35
|\
| * Merge pull request #334 from cvogeley/masterfriendica2014-02-234-0/+35
| |\
| | * little tweaksChristian Vogeley2014-02-221-2/+2
| | * Add option for narrow navbar instead of the bootstrap defaultChristian Vogeley2014-02-224-0/+35
* | | minor stuff, some doco, auth cleanup, and make "unknown" more translateable b...friendica2014-02-223-5/+2
|/ /
* | Merge https://github.com/friendica/red into zpullfriendica2014-02-222-876/+923
|\|
| * Merge pull request #333 from tobiasd/20140222tobiasd2014-02-222-876/+923
| |\
| | * DE: update to the stringsTobias Diekershoff2014-02-222-876/+923
| |/
* / This should resolve the dav authentication loop (correctly)friendica2014-02-224-9/+23
|/
* prevent mod/cloud looping (ping gets a new session on each call [wtf?] which ...friendica2014-02-222-2/+2
* Merge https://github.com/friendica/red into zpullfriendica2014-02-2119-3404/+1958
|\
| * Merge pull request #332 from zzottel/masterfriendica2014-02-225-23/+223
| |\
| | * changed old Friendica stuff to what we have now in Redzottel2014-02-211-21/+9
| | * small correctionszottel2014-02-211-2/+2
| | * first few German help fileszottel2014-02-213-0/+212
| | * Merge remote-tracking branch 'upstream/master'zottel2014-02-212-270/+3
| | |\
| | * \ Merge remote-tracking branch 'upstream/master'zottel2014-02-2120-4562/+9069
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-206-14/+33
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-2020-1258/+1468
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-1933-349/+1949
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-1716-1603/+1674
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'zottel2014-02-1575-930/+1258
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge pull request #331 from git-marijus/masterfriendica2014-02-2213-3111/+1732
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | remove some design fixes which got fixed in bootstrap 3.1.1marijus2014-02-212-4/+1
| | * | | | | | | | dont allow bootstrap to mess with blockquote font-sizemarijus2014-02-211-0/+5
| | * | | | | | | | quickfix for edit profile dropdownmarijus2014-02-211-2/+2
| | * | | | | | | | oups... to much cleaning...marijus2014-02-211-0/+58
| | * | | | | | | | update to bootstrap version 3.1.1 which is now completely MIT licensedmarijus2014-02-2110-3105/+1666
| * | | | | | | | | Merge pull request #330 from git-marijus/masterfriendica2014-02-212-270/+3
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | cleanup style.cssmarijus2014-02-212-270/+3
| |/ / / / / / /
* | | | | | | | strings/version updatefriendica2014-02-212-753/+792
* | | | | | | | doc updatefriendica2014-02-2189-546/+1170
|/ / / / / / /
* | | | | | | SECURITY: do not automatically open an iframe which points into the local web...friendica2014-02-202-1/+10
* | | | | | | move jgrowl (alert popup) out of the now taller navbarfriendica2014-02-201-1/+1
* | | | | | | fix login weirdness for accounts that need to be approvedfriendica2014-02-202-5/+11
* | | | | | | small changes to a couple of lookup functions which we need to use a bit morefriendica2014-02-204-5/+9
* | | | | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-201-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #327 from git-marijus/masterfriendica2014-02-211-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | fixes issue #326 initial scale to bigmarijus2014-02-201-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 09:12:11 +0000