Fabio Comuni
|
8be7b5c65b
|
quattro: work on
"like" activitiy items less visible
fixes to widths
popup notification out of navbar
category input in jot
|
2012-04-13 09:43:38 +02:00 |
|
Fabio Comuni
|
67a2d5be77
|
validate_url allow naked subdomain if is "localhost"
|
2012-04-13 09:42:53 +02:00 |
|
friendica
|
df1904b204
|
stray debug statements, forgot to filter pending contacts
|
2012-04-12 23:14:41 -07:00 |
|
friendica
|
3c4e6d3461
|
bug #369 - show contacts who are not in any groups
|
2012-04-12 23:06:41 -07:00 |
|
friendica
|
af68d033e3
|
extended the "interesting" profile attributes
|
2012-04-12 21:58:15 -07:00 |
|
friendica
|
446e962bb8
|
send link directly to profile tab
|
2012-04-12 21:38:40 -07:00 |
|
friendica
|
2b339d5a6b
|
stray log statements
|
2012-04-12 21:21:35 -07:00 |
|
friendica
|
972c01edb3
|
profile change activities
|
2012-04-12 21:10:32 -07:00 |
|
friendica
|
32cd62ff0a
|
allow setting default new friend notify
|
2012-04-12 18:15:46 -07:00 |
|
friendica
|
7e2d4d4026
|
turn off new friend activity by default
|
2012-04-12 16:51:57 -07:00 |
|
friendica
|
15e74402d4
|
Merge https://github.com/friendica/friendica into pull
|
2012-04-12 16:13:10 -07:00 |
|
friendica
|
2b01d2b6e0
|
rev update
|
2012-04-12 16:12:51 -07:00 |
|
Michael Vogel
|
572678fef9
|
Merge commit 'upstream/master'
Conflicts:
include/dba.php
|
2012-04-13 00:10:41 +02:00 |
|
Michael
|
7384786d44
|
Merge remote branch 'upstream/master'
|
2012-04-13 00:10:13 +02:00 |
|
Michael Vogel
|
138caa4380
|
DBA: Deactivation of the mysqli-class for testing purposes.
|
2012-04-13 00:05:52 +02:00 |
|
tommy tomson
|
e3af552bbf
|
diabook-themes: fixed css for settings aside-links
|
2012-04-12 22:00:18 +02:00 |
|
tommy tomson
|
39009b5ac9
|
diabook-themes: css-fixes in aside
|
2012-04-12 20:23:03 +02:00 |
|
tomtom84
|
2669a13378
|
Merge pull request #229 from tomtom84/master
fixes in theme diabook
|
2012-04-12 08:39:32 -07:00 |
|
tommy tomson
|
3a8e6cbacb
|
fix css in aside
|
2012-04-12 17:37:55 +02:00 |
|
friendica
|
73487989c0
|
query to find un-grouped contacts
|
2012-04-12 07:48:28 -07:00 |
|
friendica
|
60871555f5
|
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
|
2012-04-12 06:50:11 -07:00 |
|
friendica
|
03563ca35a
|
Merge https://github.com/friendica/friendica into pull
|
2012-04-12 05:48:41 -07:00 |
|
friendica
|
23b08e3ea7
|
Merge pull request #228 from fabrixxm/master
settings tabs, notifications js and quattro
|
2012-04-12 05:47:57 -07:00 |
|
friendica
|
6fa8b3067f
|
Merge https://github.com/friendica/friendica into pull
|
2012-04-12 05:46:24 -07:00 |
|
friendica
|
7eb1fbb41f
|
turn off update transactions until we figure out how to do them safely.
|
2012-04-12 05:45:28 -07:00 |
|
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 |
|