Commit Graph

4695 Commits (be2005f146fc8d482734ca48ec594bc3f797360c)
 

Author SHA1 Message Date
Fabio Comuni be2005f146 quattro: move quattro-green inside quattro folder.
11 years ago
Fabio Comuni 01af7d355a allow themes to use "style.php" instead of "style.css".
11 years ago
Fabio Comuni 77f57e1b13 Merge remote-tracking branch 'friendica/master'
11 years ago
tommy tomson f50fb7d6ca css-fixes in diabook-derivates
11 years ago
tommy tomson 6d3d882f9b css-fixes in diabook-derivates
11 years ago
Fabio Comuni 24e7a3413c quattro-green: remove settings code
11 years ago
Fabio Comuni db59a45030 quattro: add config.php
11 years ago
Fabio Comuni 054d21a2e8 settings: add "display settings" tab, with UI-related settings.
11 years ago
Tobias Diekershoff 17c908973f catch OpenID login errors in cases when the OpenID server does not answers
11 years ago
tommy tomson 5b4bb347a6 css-fixes in diabook-derivates
11 years ago
Tobias Diekershoff 8685a91742 quattro-green: added Description to the theme.php
11 years ago
Tobias Diekershoff b5e292509e quattro-green: adopted quattro option for centered display
11 years ago
friendica e36b1ed3d7 Merge branch 'pull'
11 years ago
friendica 32b346f5f1 string update
11 years ago
tomtom84 0bee09350d Merge pull request #187 from tomtom84/master
11 years ago
tommy tomson 5ced7f2bc5 add themes diabook-red & diabook-aerith
11 years ago
friendica bcc5801608 rename "file as" to "save to folder"
11 years ago
friendica 6f761e9d59 Merge branch 'pull'
11 years ago
friendica 87539dbec4 bug #352 - qcomment plugin disabled, qcomments still allowed
11 years ago
Tobias Diekershoff d22b3a1d9c Merge branch 'master' of https://github.com/friendica/friendica
11 years ago
Tobias Diekershoff e2370b56bf quattro-greey: apply theming to private mail
11 years ago
friendica d83bfd464b zrl into people searches
11 years ago
friendica e2c295c01f another silly mistake
11 years ago
friendica 9332312ce9 silly mistake
11 years ago
friendica 168cf3b9d4 zrl on mentions
11 years ago
friendica bb8beb26b4 use zrl to get home again
11 years ago
friendica cd47ba6ed1 Merge branch 'pull'
11 years ago
friendica 75f778a504 provide a way to specify an admin account for siteinfo if more than one have admin email address
11 years ago
Simon 1326c1388e Merge pull request #186 from simonlnu/master
11 years ago
Simon L'nu 3b4016168d tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
11 years ago
Simon L'nu fe1e384a51 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 5921dc6f16 typo in function name
11 years ago
Simon L'nu e7b920c273 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica e935b3a225 theme file_as combobox for 2.0
11 years ago
tommy tomson 339c8a4b56 css fixes in diabook-derivates
11 years ago
fabrixxm 3ee529d095 Merge pull request #185 from fabrixxm/master
11 years ago
Simon L'nu f2e2632810 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 4e4f7ac79f some reported warnings cleaned up
11 years ago
friendica a946b7cea3 Merge branch 'pull'
11 years ago
friendica 60fe74ce97 network permission ids
11 years ago
friendica 3f89adfd62 wrong var for notify total
11 years ago
friendica 77715c0c65 fix notification total
11 years ago
friendica 7956c2d08e improved rw notifications
11 years ago
friendica 75f3d41da2 Merge pull request #184 from annando/master
11 years ago
friendica a2b1aca27c Merge branch 'pull'
11 years ago
friendica 4fe0b56d76 bug #349 - email notls setting
11 years ago
tommy tomson aa26517cdc add a searchbox to "find friends" for global search
11 years ago
tommy tomson 1a9bbac0be bugfix in diabook
11 years ago
Michael Vogel bdd2754740 Merge commit 'upstream/master'
11 years ago
Fabio Comuni 011a96d960 quattro: style pm pages
11 years ago