friendica
5a78400f37
table cleanup
2012-04-12 05:15:45 -07:00
Fabio Comuni
309f2bfa5f
quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
2012-04-12 09:17:35 +02:00
Fabio Comuni
a23d46c49b
main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all
2012-04-12 09:15:08 +02:00
Fabio Comuni
18ecac4e93
settings: remove call to profile_load()
2012-04-12 08:42:00 +02:00
Fabio Comuni
6c50eba206
quattro: move center css to style.php. add tpl for generic_links_widget
2012-04-12 08:40:17 +02:00
Fabio Comuni
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
Simon
815a727076
Merge pull request #227 from simonlnu/master
...
minor css fixes
2012-04-11 22:09:09 -07:00
Simon L'nu
c21244f679
fix the icons a bit
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-12 01:08:02 -04:00
Simon L'nu
a3b2f35c84
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-themes: small fix
* master:
2012-04-12 01:03:54 -04:00
friendica
d52dad3826
Merge https://github.com/friendica/friendica into pull
2012-04-11 16:45:19 -07:00
friendica
8a8702c9cd
extensible item_id table for managing all the different message-ids generated by multiple services
2012-04-11 16:13:57 -07:00
Michael Vogel
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
Michael Vogel
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
tommy tomson
a1d5026abf
diabook-themes: small fix
2012-04-11 18:49:07 +02:00
Michael
39405c8056
Merge remote branch 'upstream/master'
2012-04-11 18:48:58 +02:00
Michael
c3139fa0fd
Merge branch 'master' of github.com:annando/friendica
2012-04-11 18:47:21 +02:00
Simon
cdb6510b9f
Merge pull request #226 from simonlnu/master
...
re-factor default.php
2012-04-10 23:01:57 -07:00
Simon L'nu
c79d1deb92
major refactor. step 1
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-11 01:59:33 -04:00
Simon L'nu
8ec84c5bce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
visit "random profile" feature
* master:
2012-04-11 01:57:52 -04:00
friendica
967ed8e23f
Merge https://github.com/friendica/friendica into pull
2012-04-10 20:51:04 -07:00
friendica
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
Simon
0c4e9912b0
Merge pull request #225 from simonlnu/master
...
[fixes] absolute links in docs and newmember.php; breaks sub-dir installs
2012-04-10 20:47:55 -07:00
Simon L'nu
6b414d3de4
more ' = ' spacing fixes
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 23:45:47 -04:00
Simon L'nu
75c7877986
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
* master:
2012-04-10 23:34:55 -04:00
Simon L'nu
2af41ee57b
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 23:34:39 -04:00
friendica
0fa932853c
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
2012-04-10 20:09:51 -07:00
Simon L'nu
ae9506f21e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
cleanup photo menus
more backend work on mail2 followers
make editplain work everywhere
move all fix_mce to one function so it can easily be undone
duplicate community posts
fix_mce_lf contact edit page
fix_mce_lf on profiles
set default on get_avatar
rev update
Incorrect tranlation (one negation too much)
fixed install bug
diabook-themes: smal fix in bbcode-js
diabook-themes: added url and quote to bbcode toolbar under comment box
Remove Gravatar from core and add new hook avatar_lookup.
Rename gravatar_img() more generic to avatar_img().
* master:
2012-04-10 22:51:29 -04:00
friendica
640f258f18
cleanup photo menus
2012-04-10 19:33:32 -07:00
friendica
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
friendica
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
friendica
18e225b051
move all fix_mce to one function so it can easily be undone
2012-04-10 17:14:07 -07:00
friendica
ab46f95683
duplicate community posts
2012-04-10 16:59:30 -07:00
friendica
8f40e8546e
fix_mce_lf contact edit page
2012-04-10 16:32:38 -07:00
friendica
9b1bb53234
fix_mce_lf on profiles
2012-04-10 16:31:49 -07:00
friendica
703bfcb6d4
Merge https://github.com/friendica/friendica into pull
2012-04-10 16:07:05 -07:00
friendica
14d68a0dc0
set default on get_avatar
2012-04-10 15:33:43 -07:00
friendica
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
2012-04-10 15:28:48 -07:00
friendica
35b978bb1e
rev update
2012-04-10 15:25:15 -07:00
friendica
0e97e2338a
Merge pull request #222 from CatoTH/master
...
Translation bugfix
2012-04-10 15:23:04 -07:00
friendica
3380ff3240
Merge pull request #223 from campino/master
...
bug fix
2012-04-10 15:21:37 -07:00
Tobias Hößl
e1c43c1c1c
Incorrect tranlation (one negation too much)
2012-04-10 20:43:31 +00:00
Alexander Kampmann
64cf2d089a
fixed install bug
2012-04-10 17:10:24 +02:00
tommy tomson
6db33fc513
diabook-themes: smal fix in bbcode-js
2012-04-10 15:13:34 +02:00
tommy tomson
b3f18945ba
diabook-themes: added url and quote to bbcode toolbar under comment box
2012-04-10 14:38:59 +02:00
Simon
9fafe64f82
Merge pull request #221 from simonlnu/master
...
aaah, nice asides ;). we'll be updating these soon
2012-04-10 02:50:42 -07:00
Simon L'nu
707a5dbae7
aaah, nice asides ;). we'll be updating these soon
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-10 05:48:42 -04:00
Simon L'nu
514780745f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
path to default.php in theme dir was incorrect
* master:
2012-04-10 05:03:32 -04:00
friendica
4c3b835307
path to default.php in theme dir was incorrect
2012-04-10 01:51:53 -07:00
Simon L'nu
61c28e8c2e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
rev update
source beautifarming to make review easier
fixed some typos
made exceptions from the db optional set address for updae mails correctly
added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates
* master:
2012-04-10 02:49:34 -04:00
friendica
9a8c69b024
Merge branch 'pull'
2012-04-09 16:55:06 -07:00
