aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* assets dir had the old logotuscanhobbit2014-02-254-2/+2
|
* Merge pull request #1 from friendica/masterPaolo T2014-02-251248-31142/+75933
|\ | | | | Update this fork
| * provide ability to bookmark chatrooms using rbmarkfriendica2014-02-243-4/+33
| |
| * Merge pull request #338 from solstag/masterfriendica2014-02-251-2/+2
| |\ | | | | | | Fix typo that broke jquery.divgrow. Sorry I should have tested.
| | * Fix typo that broke jquery.divgrow. Sorry I should have tested.Alexandre Hannud Abdo2014-02-251-2/+2
| | |
| * | remote "add bookmark" - like rpost but saves a bookmark from a remote hub ↵friendica2014-02-245-13/+156
| |/ | | | | | | into one of your own bookmark folders (or a new one if desired).
| * string 'null' showing up in timeago since last modifyfriendica2014-02-241-3/+2
| |
| * take a pfriendica2014-02-241-1/+1
| |
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-2414-997/+1051
| |\
| | * Merge pull request #337 from solstag/masterfriendica2014-02-2513-996/+1050
| | |\ | | | | | | | | Updates to pt-br translation, including some email templates. Fix some jQuery translation issues.
| | | * 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
| |\ | | | | | | Import doco from docs@friendicared.net
| | * 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 ↵friendica2014-02-232-2/+5
| | | | | | | | defined. Otherwise, if a pdl file exists for this module, use it.
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-224-0/+35
| |\
| | * Merge pull request #334 from cvogeley/masterfriendica2014-02-234-0/+35
| | |\ | | | | | | | | Add option for narrow navbar instead of the bootstrap default
| | | * little tweaksChristian Vogeley2014-02-221-2/+2
| | | |
| | | * Add option for narrow navbar instead of the bootstrap defaultChristian Vogeley2014-02-224-0/+35
| | | | | | | | | | | | | | | | thick version
| * | | minor stuff, some doco, auth cleanup, and make "unknown" more translateable ↵friendica2014-02-223-5/+2
| |/ / | | | | | | | | | by context.
| * | 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 strings
| | | * 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
| | | | | | | | triggers our "changed uid" detector)
| * Merge https://github.com/friendica/red into zpullfriendica2014-02-2119-3404/+1958
| |\
| | * Merge pull request #332 from zzottel/masterfriendica2014-02-225-23/+223
| | |\ | | | | | | | | First steps at German doco
| | | * 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
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | update bootstrap and revert some style.css cleaning
| | | * | | | | | | | 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.css
| | | * | | | | | | cleanup style.cssmarijus2014-02-212-270/+3
| | |/ / / / / / /
| * | | | | | | | strings/version updatefriendica2014-02-212-753/+792
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 23:55:51 +0000