tobias/friendica
1
0
Fork 0
Code Pull requests Activity
8051 commits 2 branches 61 tags 203 MiB
Commit graph

2882 commits

Author SHA1 Message Date
Tobias Diekershoff 4b02e11eeb CS: update to the strings 2013-06-16 14:49:04 +02:00
Fabrixxm faa510befc move html from paginate functions to template 2013-06-13 08:12:15 -04:00
Zach Prezkuta b4aa018d7b forgot to update Frost autocomplete JS location 2013-06-04 20:29:33 -06:00
Zach Prezkuta cc4d091db0 remove some now-unnecessary templates 2013-06-01 10:45:32 -06:00
Zach Prezkuta 127b7a589e eliminate Cropper conflicts with jQuery 2013-06-01 10:42:51 -06:00
Fabrixxm 2111f750fb quattro: show notification number in favicon 2013-05-31 06:18:59 -04:00
Tobias Diekershoff f153a4c9a1 PT-BR: update to the strings 2013-05-30 06:22:47 +02:00
Tobias Diekershoff 57b80923cf PT-BR: update to the strings 2013-05-29 21:49:36 +02:00
Tobias Diekershoff 5b1561334b DE: update to the strings 2013-05-29 21:48:59 +02:00
Tobias Diekershoff 5113885427 fix 540 in vier 2013-05-29 17:10:49 +02:00
Tobias Diekershoff c82ab9e1b5 fix bug #540 for quattro themes 2013-05-29 10:44:09 +02:00
Tobias Diekershoff ca623641ca CS: update to the strings 2013-05-25 07:29:24 +02:00
Tobias Diekershoff 1732de5c64 PL: update to the strings 2013-05-23 06:30:34 +02:00
root 8e9852dcba Missing smarty3 directory prevents installation 2013-05-18 11:10:22 +01:00
Tobias Diekershoff f840d72885 DE: update to the strings 2013-05-17 06:42:28 +02:00
Tobias Diekershoff 4d105f06e8 CA: update to the strings 2013-05-16 06:42:13 +02:00
Tobias Diekershoff 636fef1ffa DE: update to the strings 2013-05-14 19:17:44 +02:00
Zach Prezkuta db0a891a97 fix preloading 2013-05-11 12:40:09 -06:00
Zach Prezkuta 35358baac9 update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
Zach Prezkuta 5d30008ab3 don't set img src in notifications to blank 2013-05-11 09:43:21 -06:00
fermionic 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support 
basic video playback support using VideoJS
 2013-05-11 08:33:36 -07:00
Tobias Diekershoff 06ab3eb44f DE: update to the strings 2013-05-09 19:07:20 +02:00
Tobias Diekershoff 218be8a3c0 DE: Update to the strings 2013-05-09 18:40:11 +02:00
Tobias Diekershoff ba6b2718cf DE: update to the strings 2013-05-09 18:38:57 +02:00
pixelroot b06dab97ba modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/templates/tools.tpl
	modified:   view/theme/smoothly/theme.php
 2013-05-08 14:46:42 +02:00
pixelroot e90c89f3fc new file: view/theme/smoothly/images/power.png 
new file:   view/theme/smoothly/images/up.png
 2013-05-08 11:09:08 +02:00
pixelroot 523548ff22 modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/images/down.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/images/power.png
	view/theme/smoothly/images/up.png
 2013-05-08 11:08:21 +02:00
Zach Prezkuta bc57d7f64e bug in main.js for VideoJS on initial page load 2013-05-07 22:06:40 -06:00
pixelroot 258604f036 modified: view/theme/smoothly/css/typography.css 2013-05-07 14:30:04 +02:00
pixelroot 8c8d3913cc modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-05-07 14:01:54 +02:00
pixelroot 5ac6e82e7d modified: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-05-07 09:39:14 +02:00
Zach Prezkuta bd20f6ed9a add some styling for the video player 2013-05-03 19:09:12 -06:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
Tobias Diekershoff 0bbd0939e4 ZH-CN: update to the strings 2013-04-28 15:35:34 +02:00
friendica 2883c8bbc4 Merge https://github.com/friendica/friendica into pull 2013-04-28 04:31:11 -07:00
friendica 61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
Tobias Diekershoff f84c57e7f2 DE: update to the strings 2013-04-27 10:57:06 +02:00
pixelroot f41c5dd1e5 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/default.php
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/templates/nav.tpl
	modified:   view/theme/smoothly/theme.php
 2013-04-24 14:09:24 +02:00
friendica 115c8a53bf issue546 via Tobias 2013-04-23 18:58:52 -07:00
Fabrixxm 4dc72742ae remove unneeded files 2013-04-23 07:52:36 -04:00
Fabrixxm 379c761c3f missing "templates" folders 2013-04-23 07:47:57 -04:00
Fabrixxm 6fddd1cbbf template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir 2013-04-23 03:35:31 -04:00
Zach Prezkuta 78e747016f update mobile theme settings pages 2013-04-18 19:47:27 -06:00
fermionic 7b342d7297 Merge pull request #664 from tobiasd/issue_554 
Issue 554
 2013-04-18 18:37:11 -07:00
Tobias Diekershoff 7be1040a63 DE: update to the strings 2013-04-14 17:26:23 +02:00
Tobias Diekershoff 5827db0ea3 check current password before changing the password 2013-04-14 17:22:42 +02:00
Tobias Diekershoff 17ca6290f5 DE: update to the strings 2013-04-06 08:25:33 +02:00
Zach Prezkuta 2316e0d731 update admin options for frost, frost mobile, and decaf mobile 2013-04-04 16:42:39 -06:00
Tobias Diekershoff bee80004db DE: update to the strings 2013-04-04 17:27:49 +02:00
Tobias Diekershoff e77521c42f PL: update to the strings 2013-04-03 09:28:37 +02:00
pixelroot ee07251d38 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-04-01 19:36:22 +02:00
Tobias Diekershoff cda327a368 Merge pull request #658 from annando/master 
Mail importing problems, a small "vier" change
 2013-03-30 01:46:13 -07:00
Michael Vogel eabefb2f04 vier: The background color of the right area is now white. 2013-03-29 11:18:20 +01:00
Tobias Diekershoff ad48ab2928 DE: update to the strings 2013-03-28 07:49:58 +01:00
pixelroot d685181101 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-03-27 20:08:06 +01:00
pixelroot 2b7dd2f72b modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-03-26 17:10:58 +01:00
pixelroot 296c49f4a1 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-03-26 15:47:17 +01:00
pixelroot 0a446da659 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-03-26 11:28:22 +01:00
Tobias Diekershoff 48ba0619c5 PL: update to the strings 2013-03-26 07:27:09 +01:00
Tobias Diekershoff 8666673175 template additions for the options 2013-03-25 11:01:54 +01:00
Tobias Diekershoff 4986e0b3cd PL: update to the strings 2013-03-24 07:26:28 +01:00
Tobias Diekershoff d921ca26d0 RU: update to the strings 2013-03-23 08:49:40 +01:00
Tobias Diekershoff 6f382f016d RU: update to the strings 2013-03-22 07:25:08 +01:00
Tobias Diekershoff 869baa763f PL: update to the strings 2013-03-21 16:01:02 +01:00
Tobias Diekershoff 7d4f312345 DE: update to the strings 2013-03-21 15:57:52 +01:00
Michael Vogel 111495423c Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated. 2013-03-14 23:15:15 +01:00
pixelroot bb3e8ad785 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-03-12 10:06:19 +01:00
pixelroot a65ae04bcc modified: view/theme/smoothly/style.css 2013-03-11 19:59:49 +01:00
pixelroot a2adc03636 deleted: view/theme/smoothly/login.tpl 
deleted:    view/theme/smoothly/smarty3/login.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-03-11 19:19:33 +01:00
Michael Vogel 5d3613c8bc Vier: The change from blue to black in links is now faded as well. 2013-03-07 19:34:54 +01:00
Michael Vogel c40c61c106 OStatus conversations: Fixed a bug when a message hadn't got an id. 
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
 2013-03-06 23:23:04 +01:00
Michael Vogel 86e19dda22 Vier: Some more changes to the theme. 
Added a switch to suppress displaying of the tags.
 2013-03-05 00:46:11 +01:00
Michael Vogel 8bb6b51967 Vier: Some more transition effects 2013-03-04 21:11:31 +01:00
Michael Vogel 421d484839 Merge remote-tracking branch 'upstream/master' 2013-03-04 00:05:17 +01:00
Michael Vogel 478a079665 Vier: Further changes: profile border is rounded. 2013-03-04 00:04:06 +01:00
Michael Vogel 8e1d253568 OStatus conversation: now the creation date of the item is store with the conversation 
vier: The link color and the color of the top bar is changed.
 2013-03-03 23:44:50 +01:00
friendica 1c55b0b359 Merge pull request #639 from annando/master 
Community/Open Graph
 2013-03-03 12:07:52 -08:00
Zach Prezkuta 0187283709 allow admin to prevent private image embedding on hub 2013-03-03 09:44:41 -07:00
Michael Vogel 05597b564d Merge remote-tracking branch 'upstream/master' 2013-03-03 16:30:18 +01:00
friendica f07df4f667 merge 2013-03-02 15:46:54 -08:00
Michael Vogel 2866f62c88 Suppoorting Open Graph and Dublin Core when displaying single item 
Following link shorteners in parse_url
 2013-03-02 14:46:06 +01:00
Tobias Diekershoff f97c81c178 kill some newlines 2013-02-25 13:05:30 +01:00
Tobias Diekershoff 7186331a89 Admin panel: show if an account has expired 2013-02-25 13:02:17 +01:00
Tobias Diekershoff 69776fc54e Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates 
some smarty templates needed updating
 2013-02-23 23:26:48 -08:00
Tobias Diekershoff c83b82ee2b Merge pull request #626 from fermionic/20130223-disable-content-in-notifications 
admin option to disable content in email notifications
 2013-02-23 23:25:49 -08:00
Tobias Diekershoff 023752ae46 DE: update to the strings 2013-02-23 19:56:21 +01:00
Zach Prezkuta 047cf0d342 some smarty templates needed updating 2013-02-23 09:36:00 -07:00
Zach Prezkuta 4db50a3ecb admin option to disable post content in email notifications for the site 2013-02-23 09:31:34 -07:00
fabrixxm 45de0fa21b Merge pull request #624 from fabrixxm/quattrofixs 
Some fixs to Quattro theme
 2013-02-22 08:29:29 -08:00
Fabrixxm 7ac30330c6 update IT strings.php 2013-02-22 11:21:34 -05:00
Fabrixxm 7a6d63a1b3 quattro: autocomplete private message To field 2013-02-22 11:02:01 -05:00
Fabrixxm cc210bae3d quattro: fix item max-width, fix contact serarch autocomplete popup style 2013-02-22 10:45:40 -05:00
fermionic dbf51229d9 Merge pull request #621 from annando/master 
Using "term" table to improve performance, OStatus autocomplete, some more performance stuff
 2013-02-21 10:16:50 -08:00
pixelroot 5c6562a996 modified: view/theme/smoothly/style.css 2013-02-21 08:46:30 +01:00
Michael Vogel 0d4d15c73d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2013-02-20 21:57:26 +01:00
pixelroot 7a1947b88a modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-02-20 21:03:02 +01:00
Tobias Diekershoff e0e82afe18 Merge pull request #620 from tobiasd/master 
CC mails
 2013-02-18 22:26:09 -08:00
Tobias Diekershoff bd1c86ed49 PL: update to the strings 2013-02-18 09:18:45 +01:00
Tobias Diekershoff 8e65e95d17 add multi vs. single user config to the admin panel 2013-02-17 17:42:32 +01:00
Tobias Diekershoff aa2f1c38e9 add 'hide_help' to admin panel 2013-02-17 12:37:45 +01:00