clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,145 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

1809 Commits

Author SHA1 Message Date
Simon L'nu 6a2f0eb475 REALLY fix fpostit this time 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-15 03:18:55 -04:00
Simon L'nu d836be1dc3 fix fpostJS, add and fix some other stuff 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-15 02:13:36 -04:00
tommy tomson dddf3307af diabook-themes: added js for auto-growing comment-textareas 2012-04-15 04:39:33 +02:00
tommy tomson 170c15ceb9 diabook: theme-settings: add a wide-option 2012-04-15 02:50:16 +02:00
friendica 31b1d353b2 Merge pull request #234 from copyninja/master 
Executable permisson removal on files which are not elf/script
 2012-04-14 14:50:54 -07:00
Simon L'nu 6278b2a923 string fix: typo. slow down scroll to top in dispys 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-14 16:24:35 -04:00
Vasudev Kamath 41d74c0868 Another bunch of executable permission removal 2012-04-14 20:16:06 +05:30
Vasudev Kamath 626bb57e1d Removed execution permission: lintian warning in Debian packaging 2012-04-14 20:04:54 +05:30
friendica 6591b292a1 bogus empty list element in dfrn_request page when emailnet not enabled 2012-04-14 05:32:31 -07:00
Michael Vogel 4e220ec391 Merge commit 'upstream/master' 2012-04-14 13:15:25 +02:00
Simon L'nu 96cda3136b lighten wrapper shadow a bit on dispy 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-13 20:14:09 -04:00
Simon L'nu 6b46fe3dfe neat little changes. hopefully the shadow will be well recieved 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-13 19:30:07 -04:00
friendica bfb821e918 well that was a silly mistake... 2012-04-13 16:12:06 -07:00
tommy tomson 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
tommy tomson 2c843466a9 diabook: theme-settings: users can set font-size and line-height for posts and comments 2012-04-13 21:34:21 +02:00
tommy tomson 615cd53e51 diabook-themes: small fixes 2012-04-13 18:28:11 +02:00
Fabio Comuni f6e1ddf7fb Merge remote-tracking branch 'friendica/master' 2012-04-13 11:59:25 +02:00
Fabio Comuni 469710893d quattro: language icon in navbar 2012-04-13 11:56:56 +02:00
Fabio Comuni 4496d075e5 move html out of lang_selector() and new template lang_selector.tpl 2012-04-13 11:56:21 +02:00
Fabio Comuni fdf50b8574 display settings: show theme screenshot on page load 2012-04-13 11:55:36 +02:00
Fabio Comuni 7aa3b92f4c quattro: add admin theme settigs. darker items background with a bottom border. 2012-04-13 11:21:15 +02:00
Fabio Comuni 138a0e06b8 admin: change global theme settings 2012-04-13 11:20:05 +02:00
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
friendica 3c4e6d3461 bug #369 - show contacts who are not in any groups 2012-04-12 23:06:41 -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
Michael Vogel 572678fef9 Merge commit 'upstream/master' 
Conflicts:

	include/dba.php
 2012-04-13 00:10:41 +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
tommy tomson 3a8e6cbacb fix css in aside 2012-04-12 17:37:55 +02: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 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 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
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
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
friendica b02a671494 visit "random profile" feature 2012-04-10 20:50:31 -07:00
friendica ed608694ce make editplain work everywhere 2012-04-10 18:08:06 -07:00
friendica 703bfcb6d4 Merge https://github.com/friendica/friendica into pull 2012-04-10 16:07:05 -07:00
friendica 3c66816938 Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull 2012-04-10 15:28:48 -07:00
Tobias Hößl e1c43c1c1c Incorrect tranlation (one negation too much) 2012-04-10 20:43:31 +00: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 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
friendica 2d23c8a246 Merge pull request #218 from campino/master 
db errors and update error mail
 2012-04-09 16:53:23 -07:00
tommy tomson 0d4fab4ee3 bbcode toolbar attached to the comment text field 
minor css-fixes
 2012-04-10 00:55:39 +02:00
Klaus Weidenbach 1f9fe8b5ee Remove Gravatar from core and add new hook avatar_lookup. 
This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in.
I haven't touched the language files yet. Are they updated automatically somehow?
 2012-04-09 21:22:09 +02:00
tommy tomson d25a9df996 diabook-themes: small icon fix 2012-04-09 19:56:53 +02:00
Alexander Kampmann 2190b95d80 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 16:56:37 +02:00
tommy tomson c27c340de1 diabook-nav-icons with gradient 2012-04-09 16:41:23 +02:00
Alexander Kampmann 1370ba5d16 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 14:28:21 +02:00
Alexander Kampmann 7187516718 fixed some typos 2012-04-09 14:27:52 +02:00
Michael Vogel 894e126c55 API: Tweetdeck is now working 2012-04-09 11:49:33 +02:00
zottel 5183d4f77d Some new German translations 2012-04-09 02:30:18 +02:00
Alexander Kampmann 0d60dbef31 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

added german translation for admin email
 2012-04-09 00:45:10 +02:00
tommy tomson 7d018f651d fixed z-index of youtube-vids 
fixed bug to hide right_side
 2012-04-09 00:02:48 +02:00
friendica 741a5dba57 provide theme_init() functions 2012-04-08 05:52:00 -07:00
Michael Vogel ce0eac44b5 Merge commit 'upstream/master' 2012-04-08 10:07:39 +02:00
Simon L'nu 01961f7caa minor dispy* fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-07 23:46:47 -04:00
tommy tomson f931d5c918 diabook-themes: small fix 2012-04-07 19:56:00 +02:00
Michael Vogel 17d097124c "vier": Some design stuff 2012-04-07 18:35:37 +02:00
Michael Vogel cb05801a90 Merge commit 'upstream/master' 2012-04-07 18:35:29 +02:00
tommy tomson 1c0700f371 changelog 1.014 : 
image-rezise via jquery-plugin in stream
comments under uploaded pictues
add Diabook's version-number in head-section

css-fixes:
tabs
youtube-iframe
title-bar in jot-wrapper
blockquote & .oembed
 2012-04-07 16:39:43 +02:00
Michael Vogel 7308dbae28 "vier": Bookmarks now look better. 2012-04-07 01:19:07 +02:00
tomtom84 adf3ad5fd6 Merge pull request #210 from tomtom84/master 
fixes in diabook-derivates
 2012-04-06 04:29:01 -07:00
Tobias Diekershoff eb6370fa41 small fixes for the German strings 2012-04-06 12:43:20 +02:00
tommy tomson f980b79edc new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... 
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...
 2012-04-06 11:19:12 +02:00
Tobias Diekershoff afd2bf031e update to the German strings 2012-04-06 09:37:50 +02:00
Michael Vogel 34d268544e Merge commit 'upstream/master' 2012-04-06 00:00:46 +02:00
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica 
Conflicts:
	include/config.php
	update.php
 2012-04-05 13:39:15 +02:00
Simon L'nu df82affe2f finish styling category tags and category input 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-05 00:04:23 -04:00
Simon L'nu 9ee424c1e3 style categorytags 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-04 23:47:35 -04:00
Simon L'nu 8e5489846d update the dispy* templates 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-04 23:35:07 -04:00
friendica c4ca21a762 move alert box away from nav links 2012-04-04 19:13:41 -07:00
Simon L'nu 922d690d1e latest changes are the popup menu for notifs, fixes 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-04 02:19:39 -04:00
friendica 1e02fd8a72 Merge branch 'pull' 2012-04-03 19:16:59 -07:00
friendica 3db2cf76b9 remove loozah themes which fell too far behind to recover 2012-04-03 16:40:25 -07:00
tommy tomson f0a8ef64fe smal fix 2012-04-03 21:45:58 +02:00
tommy tomson cd309b69e6 german translation for right_aside 2012-04-03 21:06:57 +02:00
tommy tomson 8a71191d6d make right_aside translatable and provide german translation... 
and some css-fixes
 2012-04-03 20:59:00 +02:00
Michael Vogel 81dfb61f93 API: template for test function added 2012-04-02 22:36:05 +02:00
Michael Vogel 3dc317dcc6 Merge commit 'upstream/master' 2012-04-02 22:00:22 +02:00
tommy tomson 6dfd55668f diabook-themes: css-fixes 2012-04-02 20:30:27 +02:00
tommy tomson 076b1b374b diabook-themes: fixes in js 2012-04-02 18:16:58 +02:00
tommy tomson b5d57d5313 diabook-themes: fixed pageheader 2012-04-02 17:17:14 +02:00
tommy tomson 9faa940f04 diabook-themes: bugfixes / css-fixes 2012-04-02 15:06:55 +02:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
tommy tomson 23dc376364 diabook-themes: add link to global dir in "find friends" at right_aside 2012-04-02 01:29:20 +02:00
Michael Vogel a39d8d3f02 The "vier"-theme is now working again. But there is still work needed 2012-04-02 00:08:49 +02:00
tommy tomson 408de09f72 css-fixes 2012-04-02 00:05:49 +02:00
tommy tomson f075e977fe add new messages-layout in diabook 2012-04-01 18:12:20 +02:00
tommy tomson ff12637ceb fix the display of community-plugin in diabook-themes 2012-04-01 16:34:31 +02:00
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 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 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
tommy tomson 36545e554b diabook-themes: move "common tabs" to left side on settings page 2012-03-31 18:42:11 +02:00