aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-306-14/+36
|\
| * css-fixes in diabook-derivatestommy tomson2012-03-306-14/+36
| |
* | quattro-green: remove settings codeFabio Comuni2012-03-301-29/+0
| | | | | | | | Use config.php from quattro
* | quattro: add config.phpFabio Comuni2012-03-303-35/+35
| |
* | settings: add "display settings" tab, with UI-related settings.Fabio Comuni2012-03-303-77/+180
|/ | | | | Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.
* css-fixes in diabook-derivatestommy tomson2012-03-308-32/+29
|
* catch OpenID login errors in cases when the OpenID server does not answersTobias Diekershoff2012-03-301-1/+5
|
* css-fixes in diabook-derivatestommy tomson2012-03-306-9/+19
|
* quattro-green: added Description to the theme.phpTobias Diekershoff2012-03-301-0/+1
|
* quattro-green: adopted quattro option for centered displayTobias Diekershoff2012-03-302-1/+56
|
* Merge branch 'pull'friendica2012-03-30170-6/+18107
|\
| * Merge pull request #187 from tomtom84/mastertomtom842012-03-30170-6/+18107
| |\ | | | | | | add themes diabook-red & diabook-aerith
| | * add themes diabook-red & diabook-aerithtommy tomson2012-03-30170-6/+18107
| |/
* / string updatefriendica2012-03-301-964/+1230
|/
* rename "file as" to "save to folder"friendica2012-03-303-4/+4
|
* Merge branch 'pull'friendica2012-03-302-29/+128
|\
| * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-304-5/+5
| |\
| * | quattro-greey: apply theming to private mailTobias Diekershoff2012-03-302-29/+128
| | |
* | | bug #352 - qcomment plugin disabled, qcomments still allowedfriendica2012-03-301-2/+5
| |/ |/|
* | zrl into people searchesfriendica2012-03-294-5/+5
|/
* another silly mistakefriendica2012-03-292-5/+5
|
* silly mistakefriendica2012-03-291-2/+3
|
* zrl on mentionsfriendica2012-03-291-0/+6
|
* use zrl to get home againfriendica2012-03-297-17/+54
|
* Merge branch 'pull'friendica2012-03-296-58/+44
|\
| * Merge pull request #186 from simonlnu/masterSimon2012-03-296-58/+44
| |\ | | | | | | tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
| | * tweaking stuff in dispys. i thought i fixed the login screens, but they're ↵Simon L'nu2012-03-296-58/+44
| | | | | | | | | | | | | | | | | | b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-292-4/+3
| | |\ | | |/ | |/| | | | | | | | | | | | | * remotes/upstream/master: typo in function name * master:
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2931-135/+657
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme file_as combobox for 2.0 css fixes in diabook-derivates quattro: style pm pages message: remove tabs, move new message link to aside, all message with gmail-style quattro: tpl for "file as" * master:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: some reported warnings cleaned up network permission ids wrong var for notify total fix notification total improved rw notifications bug #349 - email notls setting add a searchbox to "find friends" for global search bugfix in diabook title not updated when editing post New parameter in html2plain for plain text exports. More compatibility in API API: added max_id API: Now threading seems to work API: Seesmic is now working. Optimizing text export. Quotes with author are now having an "open/close" link New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements * master:
* | | | provide a way to specify an admin account for siteinfo if more than one have ↵friendica2012-03-291-1/+5
|/ / / | | | | | | | | | admin email address
* | / typo in function namefriendica2012-03-292-4/+3
| |/ |/|
* | theme file_as combobox for 2.0friendica2012-03-292-1/+8
| |
* | css fixes in diabook-derivatestommy tomson2012-03-2916-23/+136
| |
* | Merge pull request #185 from fabrixxm/masterfabrixxm2012-03-2813-111/+513
|\ \ | |/ |/| Updated private message pages
| * quattro: style pm pagesFabio Comuni2012-03-288-64/+405
| |
| * message: remove tabs, move new message link to aside, all message with ↵Fabio Comuni2012-03-284-47/+96
| | | | | | | | gmail-style
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-2822-130/+316
| |\
| * | quattro: tpl for "file as"Fabio Comuni2012-03-281-0/+12
| | |
* | | some reported warnings cleaned upfriendica2012-03-283-8/+11
| | |
* | | Merge branch 'pull'friendica2012-03-2810-78/+317
|\ \ \
| * \ \ Merge pull request #184 from annando/masterfriendica2012-03-2810-78/+317
| |\ \ \ | | | | | | | | | | Enhancing the API - Preparations for a better facebook export
| | * \ \ Merge commit 'upstream/master'Michael Vogel2012-03-28598-11992/+36509
| | |\ \ \ | | | | |/ | | | |/|
| | * | | New parameter in html2plain for plain text exports. More compatibility in APIMichael Vogel2012-03-212-17/+83
| | | | |
| | * | | API: added max_idMichael Vogel2012-03-181-2/+6
| | | | |
| | * | | API: Now threading seems to workMichael Vogel2012-03-181-4/+12
| | | | |
| | * | | API: Seesmic is now working. Optimizing text export.Michael Vogel2012-03-184-59/+164
| | | | |
| | * | | Quotes with author are now having an "open/close" linkMichael Vogel2012-03-172-3/+25
| | | | |
| | * | | New bbcode element: "spoiler". Mail: Top post quotes are now embraced in ↵Michael Vogel2012-03-176-5/+39
| | | | | | | | | | | | | | | | | | | | "spoiler" elements
* | | | | network permission idsfriendica2012-03-281-1/+23
| | | | |