friendica
7581b32bb3
Merge branch 'pull'
2012-03-31 14:50:14 -07:00
friendica
0cf2e051bb
escape % in file_tag_query as it is ultimately embedded in a sprintf
2012-03-31 14:48:35 -07:00
tomtom84
05ad28fb9b
Merge pull request #193 from tomtom84/master
...
diabook-themes: move "common tabs" to left side on settings page
2012-03-31 09:44:12 -07:00
tommy tomson
36545e554b
diabook-themes: move "common tabs" to left side on settings page
2012-03-31 18:42:11 +02:00
tomtom84
19a7096be6
Merge pull request #192 from tomtom84/master
...
fixes in diabook-derivates
2012-03-31 08:00:45 -07:00
tommy tomson
13ded12ffb
move the common tabs to right_aside in diabook-derivates
2012-03-31 16:58:02 +02:00
friendica
adebc2793e
register hooks for a COPA plugin
2012-03-31 06:15:33 -07:00
friendica
c34a71eba6
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
2012-03-31 05:51:56 -07:00
friendica
d5a31e5791
Merge branch 'pull'
2012-03-31 04:40:35 -07:00
tommy tomson
893ece9066
bug fix in diabook-aerith and -red
2012-03-31 11:50:33 +02:00
tomtom84
ee9a3eb163
Merge pull request #191 from tomtom84/master
...
bug-fixes in diabook-derivates
2012-03-31 02:11:30 -07:00
tommy tomson
0b41654935
bug-fixes in diabook-derivates
2012-03-31 11:09:57 +02:00
Simon
3d2bcaa5fc
Merge pull request #190 from simonlnu/master
...
forgot the css changes for last push
2012-03-31 01:03:39 -07:00
Simon L'nu
f5e3ec9a56
forgot the css changes for last push
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 04:02:51 -04:00
friendica
b4b1055b50
settings for unknown private mail acceptance
2012-03-31 00:57:59 -07:00
Simon
ee95c12a24
Merge pull request #189 from simonlnu/master
...
most notable one is fixing qcomment
2012-03-31 00:57:26 -07:00
Simon L'nu
b88a452c6b
theme fixes; fix qcomment (finally)
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-31 03:56:06 -04:00
Simon L'nu
e940acf8c6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
warning cleanup
* master:
2012-03-31 03:42:19 -04:00
friendica
8c928e67ba
warning cleanup
2012-03-30 23:18:46 -07:00
Simon L'nu
301527e5a2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
don't delete contact from a friend request if friendship was already established
quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme.
allow themes to use "style.php" instead of "style.css". Load style.php trhu mod/view.php to pass it friendica framework.
css-fixes in diabook-derivates
css-fixes in diabook-derivates
quattro-green: remove settings code Use config.php from quattro
quattro: add config.php
settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.
catch OpenID login errors in cases when the OpenID server does not answers
css-fixes in diabook-derivates
quattro-green: added Description to the theme.php
* master:
2012-03-30 19:48:15 -04:00
friendica
aace55df0a
Merge branch 'pull'
2012-03-30 15:12:20 -07:00
friendica
cfdfcb37cb
don't delete contact from a friend request if friendship was already established
2012-03-30 15:10:50 -07:00
friendica
007d67a998
Merge pull request #188 from fabrixxm/master
...
Display settings tab and theme settings code
2012-03-30 14:58:44 -07:00
Fabio Comuni
be2005f146
quattro: move quattro-green inside quattro folder.
...
Add config option to select quattro color scheme.
2012-03-30 21:21:14 +02:00
Fabio Comuni
01af7d355a
allow themes to use "style.php" instead of "style.css".
...
Load style.php trhu mod/view.php to pass it friendica framework.
2012-03-30 21:18:25 +02:00
Fabio Comuni
77f57e1b13
Merge remote-tracking branch 'friendica/master'
2012-03-30 19:37:43 +02:00
tommy tomson
f50fb7d6ca
css-fixes in diabook-derivates
2012-03-30 17:52:29 +02:00
tommy tomson
6d3d882f9b
css-fixes in diabook-derivates
2012-03-30 16:33:34 +02:00
Fabio Comuni
24e7a3413c
quattro-green: remove settings code
...
Use config.php from quattro
2012-03-30 15:46:14 +02:00
Fabio Comuni
db59a45030
quattro: add config.php
2012-03-30 15:45:23 +02:00
Fabio Comuni
054d21a2e8
settings: add "display settings" tab, with UI-related settings.
...
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
2012-03-30 15:45:02 +02:00
Tobias Diekershoff
17c908973f
catch OpenID login errors in cases when the OpenID server does not answers
2012-03-30 15:19:17 +02:00
tommy tomson
5b4bb347a6
css-fixes in diabook-derivates
2012-03-30 14:38:21 +02:00
Tobias Diekershoff
8685a91742
quattro-green: added Description to the theme.php
2012-03-30 14:24:45 +02:00
Simon L'nu
c5cb208cb8
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
quattro-green: adopted quattro option for centered display
string update
add themes diabook-red & diabook-aerith
rename "file as" to "save to folder"
bug #352 - qcomment plugin disabled, qcomments still allowed
quattro-greey: apply theming to private mail
zrl into people searches
another silly mistake
silly mistake
zrl on mentions
use zrl to get home again
provide a way to specify an admin account for siteinfo if more than one have admin email address
* master:
2012-03-30 08:17:40 -04:00
Tobias Diekershoff
b5e292509e
quattro-green: adopted quattro option for centered display
2012-03-30 14:03:33 +02:00
friendica
e36b1ed3d7
Merge branch 'pull'
2012-03-30 04:53:49 -07:00
friendica
32b346f5f1
string update
2012-03-30 04:53:00 -07:00
tomtom84
0bee09350d
Merge pull request #187 from tomtom84/master
...
add themes diabook-red & diabook-aerith
2012-03-30 04:51:51 -07:00
tommy tomson
5ced7f2bc5
add themes diabook-red & diabook-aerith
2012-03-30 13:48:34 +02:00
friendica
bcc5801608
rename "file as" to "save to folder"
2012-03-30 02:42:36 -07:00
friendica
6f761e9d59
Merge branch 'pull'
2012-03-30 02:24:14 -07:00
friendica
87539dbec4
bug #352 - qcomment plugin disabled, qcomments still allowed
2012-03-30 02:22:57 -07:00
Tobias Diekershoff
d22b3a1d9c
Merge branch 'master' of https://github.com/friendica/friendica
2012-03-30 08:12:28 +02:00
Tobias Diekershoff
e2370b56bf
quattro-greey: apply theming to private mail
2012-03-30 08:10:49 +02:00
friendica
d83bfd464b
zrl into people searches
2012-03-29 22:20:14 -07:00
friendica
e2c295c01f
another silly mistake
2012-03-29 21:44:30 -07:00
friendica
9332312ce9
silly mistake
2012-03-29 21:18:47 -07:00
friendica
168cf3b9d4
zrl on mentions
2012-03-29 21:08:10 -07:00
friendica
bb8beb26b4
use zrl to get home again
2012-03-29 20:58:32 -07:00
Tobias Diekershoff