tommy tomson
15ba0ef5d0
various bugfixes and css-fixes
2012-04-01 13:12:15 +02:00
friendica
bc283f7c5d
qcomment overflow
2012-04-01 03:37:41 -07:00
friendica
f0b8d01615
try slightly better detection of html in feeds
2012-04-01 03:19:37 -07:00
friendica
ae5e5bf1e4
Merge branch 'pull'
2012-04-01 01:03:05 -07:00
friendica
5c2fdc795f
send unverified private mail using zrl
2012-04-01 00:59:35 -07:00
Simon
4bf2a7bf50
Merge pull request #194 from simonlnu/master
...
latest fixes for dispys. tweaking/repairing
2012-04-01 00:58:08 -07:00
Simon L'nu
db7f7e4237
latest fixes for dispys. tweaking/repairing
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-01 03:57:05 -04:00
Simon L'nu
bbd86382a6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
line 86: s/Friendika/Friendica/
fix "between yourself and You" in mail list
* master:
2012-04-01 03:54:58 -04:00
Simon
e97d90820d
line 86: s/Friendika/Friendica/
2012-04-01 04:52:45 -03:00
friendica
ea10bba147
fix "between yourself and You" in mail list
2012-03-31 20:08:32 -07:00
Simon L'nu
ed8c5954a9
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
more error handling
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
handle escaped file chars in display and search
escape % in file_tag_query as it is ultimately embedded in a sprintf
diabook-themes: move "common tabs" to left side on settings page
move the common tabs to right_aside in diabook-derivates
register hooks for a COPA plugin
some js fixes - ignore backspace as history selector and cleanup errors closing non-existent menus
bug fix in diabook-aerith and -red
bug-fixes in diabook-derivates
settings for unknown private mail acceptance
* master:
2012-03-31 22:46:13 -04:00
friendica
e6fd6bfd89
more error handling
2012-03-31 17:44:34 -07:00
friendica
2147e0a71f
ensure all new users get a timezone. We'll use UTC until they choose otherwise.
2012-03-31 16:08:40 -07:00
friendica
53f799f2bc
handle escaped file chars in display and search
2012-03-31 15:25:17 -07:00
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
Michael Vogel
59b45f7fc1
Several improvements
2012-03-31 16:28:39 +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 L'nu
6b086cd266
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-03-31 04:05:19 -04: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
zottel
f39e812677
Merge remote branch 'upstream/master'
2012-03-31 00:30:34 +02: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
