This website requires JavaScript.
97715c73fc
Merge https://github.com/friendica/friendica into pull
2012-04-15 05:12:14 -07:00
0a3454c841
function name typo
2012-04-15 05:11:52 -07:00
a2c4ce7487
Merge remote branch 'upstream/master'
2012-04-15 14:11:11 +02:00
f299749758
Merge pull request #237 from simonlnu/master
2012-04-15 00:20:12 -07:00
6a2f0eb475
REALLY fix fpostit this time
2012-04-15 03:18:55 -04:00
d90076b01a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-15 03:17:01 -04:00
4572179a24
Merge pull request #236 from simonlnu/master
2012-04-14 23:14:52 -07:00
d836be1dc3
fix fpostJS, add and fix some other stuff
2012-04-15 02:13:36 -04:00
adc932a5e2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-15 00:40:21 -04:00
dddf3307af
diabook-themes: added js for auto-growing comment-textareas
2012-04-15 04:39:33 +02:00
170c15ceb9
diabook: theme-settings: add a wide-option
2012-04-15 02:50:16 +02:00
31b1d353b2
Merge pull request #234 from copyninja/master
2012-04-14 14:50:54 -07:00
0939029b74
track requested profile error msg
2012-04-14 14:45:09 -07:00
4ef5b9c4e3
Merge pull request #235 from simonlnu/master
2012-04-14 13:25:51 -07:00
6278b2a923
string fix: typo. slow down scroll to top in dispys
2012-04-14 16:24:35 -04:00
1dd22be4d2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-14 15:12:39 -04:00
41d74c0868
Another bunch of executable permission removal
2012-04-14 20:16:06 +05:30
626bb57e1d
Removed execution permission: lintian warning in Debian packaging
2012-04-14 20:04:54 +05:30
6591b292a1
bogus empty list element in dfrn_request page when emailnet not enabled
2012-04-14 05:32:31 -07:00
6af4183302
zrl on random profile
2012-04-14 05:07:00 -07:00
f4ea764aaf
zrl hook
2012-04-14 04:54:26 -07:00
e825a73f1d
DBA: Reverting back to original source
2012-04-14 13:35:11 +02:00
9dd0ef2aeb
bug #372 - category feeds
2012-04-14 04:19:41 -07:00
eb27c32065
DBA: Nothing really done ..
2012-04-14 13:17:58 +02:00
4e220ec391
Merge commit 'upstream/master'
2012-04-14 13:15:25 +02:00
188829ed46
Merge remote branch 'upstream/master'
2012-04-14 13:03:40 +02:00
0d869ceb65
pass zrl's to/through global directory
2012-04-14 03:51:41 -07:00
16f729912a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-14 01:34:25 -04:00
7c63ca8364
one more
2012-04-13 17:39:12 -07:00
0d0aa7495b
additional marital status selectors
2012-04-13 17:34:02 -07:00
1a0995f1bb
Merge pull request #233 from simonlnu/master
2012-04-13 17:14:46 -07:00
96cda3136b
lighten wrapper shadow a bit on dispy
2012-04-13 20:14:09 -04:00
13930e9a80
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-13 20:13:30 -04:00
5877587e6e
Merge pull request #232 from simonlnu/master
2012-04-13 16:31:25 -07:00
6b46fe3dfe
neat little changes. hopefully the shadow will be well recieved
2012-04-13 19:30:07 -04:00
a3d95f79f2
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-13 19:26:18 -04:00
bfb821e918
well that was a silly mistake...
2012-04-13 16:12:06 -07:00
d1b57d6e74
setting wasn't being applied
2012-04-13 15:37:25 -07:00
e71f01b549
Merge https://github.com/friendica/friendica into pull
2012-04-13 14:44:57 -07:00
dfe774179a
rev update
2012-04-13 14:44:37 -07:00
a300616bcb
diabook-themes: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 22:08:13 +02:00
1ab69c2720
Merge pull request #231 from tomtom84/master
2012-04-13 12:36:07 -07:00
2c843466a9
diabook: theme-settings: users can set font-size and line-height for posts and comments
2012-04-13 21:34:21 +02:00
615cd53e51
diabook-themes: small fixes
2012-04-13 18:28:11 +02:00
11ba88b6d2
Merge pull request #230 from fabrixxm/master
2012-04-13 06:02:18 -07:00
f6e1ddf7fb
Merge remote-tracking branch 'friendica/master'
2012-04-13 11:59:25 +02:00
469710893d
quattro: language icon in navbar
2012-04-13 11:56:56 +02:00
4496d075e5
move html out of lang_selector() and new template lang_selector.tpl
2012-04-13 11:56:21 +02:00
fdf50b8574
display settings: show theme screenshot on page load
2012-04-13 11:55:36 +02:00
7aa3b92f4c
quattro: add admin theme settigs. darker items background with a bottom border.
2012-04-13 11:21:15 +02:00
138a0e06b8
admin: change global theme settings
2012-04-13 11:20:05 +02:00
093c3a936f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-13 04:11:17 -04:00
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
67a2d5be77
validate_url allow naked subdomain if is "localhost"
2012-04-13 09:42:53 +02:00
df1904b204
stray debug statements, forgot to filter pending contacts
2012-04-12 23:14:41 -07:00
3c4e6d3461
bug #369 - show contacts who are not in any groups
2012-04-12 23:06:41 -07:00
af68d033e3
extended the "interesting" profile attributes
2012-04-12 21:58:15 -07:00
446e962bb8
send link directly to profile tab
2012-04-12 21:38:40 -07:00
2b339d5a6b
stray log statements
2012-04-12 21:21:35 -07:00
972c01edb3
profile change activities
2012-04-12 21:10:32 -07:00
32cd62ff0a
allow setting default new friend notify
2012-04-12 18:15:46 -07:00
7e2d4d4026
turn off new friend activity by default
2012-04-12 16:51:57 -07:00
15e74402d4
Merge https://github.com/friendica/friendica into pull
2012-04-12 16:13:10 -07:00
2b01d2b6e0
rev update
2012-04-12 16:12:51 -07:00
572678fef9
Merge commit 'upstream/master'
2012-04-13 00:10:41 +02:00
7384786d44
Merge remote branch 'upstream/master'
2012-04-13 00:10:13 +02:00
138caa4380
DBA: Deactivation of the mysqli-class for testing purposes.
2012-04-13 00:05:52 +02:00
e3af552bbf
diabook-themes: fixed css for settings aside-links
2012-04-12 22:00:18 +02:00
39009b5ac9
diabook-themes: css-fixes in aside
2012-04-12 20:23:03 +02:00
2669a13378
Merge pull request #229 from tomtom84/master
2012-04-12 08:39:32 -07:00
3a8e6cbacb
fix css in aside
2012-04-12 17:37:55 +02:00
73487989c0
query to find un-grouped contacts
2012-04-12 07:48:28 -07:00
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
03563ca35a
Merge https://github.com/friendica/friendica into pull
2012-04-12 05:48:41 -07:00
23b08e3ea7
Merge pull request #228 from fabrixxm/master
2012-04-12 05:47:57 -07:00
6fa8b3067f
Merge https://github.com/friendica/friendica into pull
2012-04-12 05:46:24 -07:00
7eb1fbb41f
turn off update transactions until we figure out how to do them safely.
2012-04-12 05:45:28 -07:00
5a78400f37
table cleanup
2012-04-12 05:15:45 -07:00
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
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
18ecac4e93
settings: remove call to profile_load()
2012-04-12 08:42:00 +02:00
6c50eba206
quattro: move center css to style.php. add tpl for generic_links_widget
2012-04-12 08:40:17 +02:00
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
2012-04-12 08:38:55 +02:00
815a727076
Merge pull request #227 from simonlnu/master
2012-04-11 22:09:09 -07:00
c21244f679
fix the icons a bit
2012-04-12 01:08:02 -04:00
a3b2f35c84
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-12 01:03:54 -04:00
d52dad3826
Merge https://github.com/friendica/friendica into pull
2012-04-11 16:45:19 -07:00
8a8702c9cd
extensible item_id table for managing all the different message-ids generated by multiple services
2012-04-11 16:13:57 -07:00
ee714daf4d
Merge commit 'upstream/master'
2012-04-11 19:35:51 +02:00
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
2012-04-11 19:31:01 +02:00
a1d5026abf
diabook-themes: small fix
2012-04-11 18:49:07 +02:00
39405c8056
Merge remote branch 'upstream/master'
2012-04-11 18:48:58 +02:00
c3139fa0fd
Merge branch 'master' of github.com:annando/friendica
2012-04-11 18:47:21 +02:00
cdb6510b9f
Merge pull request #226 from simonlnu/master
2012-04-10 23:01:57 -07:00
c79d1deb92
major refactor. step 1
2012-04-11 01:59:33 -04:00
8ec84c5bce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-11 01:57:52 -04:00
967ed8e23f
Merge https://github.com/friendica/friendica into pull
2012-04-10 20:51:04 -07:00
b02a671494
visit "random profile" feature
2012-04-10 20:50:31 -07:00
0c4e9912b0
Merge pull request #225 from simonlnu/master
2012-04-10 20:47:55 -07:00
6b414d3de4
more ' = ' spacing fixes
2012-04-10 23:45:47 -04:00
friendica
zottel
Simon
Simon L'nu
tommy tomson
Vasudev Kamath
Michael Vogel
tomtom84
Fabio Comuni