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

2888 commits

Author SHA1 Message Date
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
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
Tobias Diekershoff 2e6577fb32 DE; update to the strings, fixing #476 2013-02-17 11:19:12 +01:00
Michael Vogel 3e58060b30 API: beautify the output of repeated items 
Vier: Birthday reminder looks better
 2013-02-15 20:14:45 +01:00
Fabrixxm 64ca15f7f9 update it strings 2013-02-15 11:23:49 -05:00
Tobias Diekershoff c5b8082c31 ZH-CN: update to the strings to 100% thx Matthew 2013-02-11 06:23:55 +01:00
Tobias Diekershoff 3eeee2525c CA: update to the strings 2013-02-11 06:21:10 +01:00
fermionic 8e80755a47 Merge pull request #615 from fermionic/20130210-update-frost-mobile 
add new Smarty3 templates
 2013-02-10 16:12:50 -08:00
Zach Prezkuta e377fd9d22 add new Smarty3 templates 2013-02-10 17:11:55 -07:00
fermionic 6b6f00c702 Merge pull request #613 from fermionic/20130210-update-frost 
update to Frost v0.4
 2013-02-10 14:02:53 -08:00
Zach Prezkuta 646c161506 added files for Frost Mobile v0.3 2013-02-10 15:00:20 -07:00
Zach Prezkuta 4d8678e523 update to Frost v0.4 2013-02-10 14:57:44 -07:00
Zach Prezkuta c1c83115ad Update Frost-mobile to v0.3 2013-02-10 10:21:52 -07:00
Tobias Diekershoff 5195d99216 ZH-CN: update to the strings 2013-02-08 17:26:08 +01:00
Zach Prezkuta c4e6cb916d move all commands inside the duepuntozero_init() function 2013-02-08 09:03:50 -07:00
friendica c273adf0fe Merge pull request #608 from fermionic/20130204-diabook-reduce-css 
Try to start reducing Diabook CSS
 2013-02-05 17:36:33 -08:00
friendica 2044862eb9 Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse 
add support for more file attachment types
 2013-02-05 17:19:53 -08:00
Zach Prezkuta d8f7e9be26 make the diabook-aerith -wide.css variants inherit from the non-wide css files 2013-02-04 22:34:48 -07:00
Zach Prezkuta 665af33726 have the base -wide.css variants inherit from the non-wide version 2013-02-04 22:17:55 -07:00
Zach Prezkuta 6152cbd5ac add support for more file attachment types 2013-02-04 22:15:16 -07:00
Zach Prezkuta 2b94590bbf elastic transitions 2013-02-04 18:20:47 -07:00
Zach Prezkuta 0e67ba2bd4 update minified javascripts 2013-02-04 18:16:13 -07:00
Zach Prezkuta 1033e8896f finish updating themes for colorbox 2013-02-04 18:09:56 -07:00
Zach Prezkuta 0f25455d1b starting switching to colorbox 2013-02-04 18:09:56 -07:00
Tobias Diekershoff 9dbe7efce5 ZH-CN: update to the strings 2013-02-03 15:14:57 +01:00
zottel 7db626b1b5 also reset network in mobile themes, smarty3 updates 2013-02-01 20:37:16 +01:00
zottel e2949ab913 Merge remote branch 'upstream/master' 2013-02-01 20:31:55 +01:00
Tobias Diekershoff bfe7b5e1c3 ZH-CN: update to the strings 2013-02-01 10:49:32 +01:00
zottel c0af9b2938 Reset network when showing a contact's posts 
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
 2013-02-01 09:12:37 +01:00
Zach Prezkuta 7d3a923294 script for minifying javascript files 2013-01-31 19:05:27 -07:00
Tobias Diekershoff 303e5e1b10 ZH-CN: update to the strings 2013-01-31 06:42:10 +01:00
Thomas Willingham d0d9ae3096 Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme. 2013-01-30 02:51:47 +00:00
Tobias Diekershoff 50a64a47fc ZH-CN: update to the strings 2013-01-28 15:23:09 +01:00
Tobias Diekershoff 612af04b1c DE: update to the strings 2013-01-28 15:21:57 +01:00
Tobias Diekershoff 5c3bce30d6 Merge branch 'master' of git://github.com/friendica/friendica 2013-01-28 07:00:07 +01:00
Tobias Diekershoff 28e4b8512a ZH-CN: update to the strings 2013-01-28 06:57:44 +01:00
friendica a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme 
Decaf mobile: an (almost) Javascript-free theme
 2013-01-27 19:11:36 -08:00
Zach Prezkuta 6668d22d37 try to improve TinyMCE block handling 2013-01-27 14:41:48 -07:00
Zach Prezkuta a15fff2fc6 mark experimental 2013-01-26 13:10:10 -07:00
Zach Prezkuta acc4d66cd3 update smart templates 2013-01-26 13:07:54 -07:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
friendica 37a5ff848d Merge https://github.com/friendica/friendica into pull 2013-01-25 13:50:27 -08:00
friendica 04b48688b6 add form security to invite page and set maximum per user invites 2013-01-25 13:48:57 -08:00
Tobias Diekershoff ec58e106c2 ZH-CN: update to the strings 2013-01-24 07:38:13 +01:00
Tobias Diekershoff cb4edf3928 IT: update to the strings 2013-01-24 07:37:16 +01:00
fabrixxm 9b394dbe1e Merge pull request #589 from fabrixxm/master 
Update fancybox, remove tiptip
 2013-01-23 01:19:05 -08:00
Fabrixxm a875bec75c update fancybox, remove tiptip from head.tpl 2013-01-22 08:17:23 -05:00
Tobias Diekershoff 03ec6cabda PL: update to the strings 2013-01-22 08:01:25 +01:00
Tobias Diekershoff da12177aea PL: update to the strings 2013-01-21 08:05:57 +01:00
Michael - piratica.eu cc9ce39e3f Merge branch 'master' of https://github.com/annando/friendica 
Conflicts:
	include/poller.php
 2013-01-20 14:17:09 +01:00
Michael - piratica.eu 7ab335c9d6 Diaspora: Auto-adding users as friend who already sharing with us 2013-01-20 14:08:28 +01:00
Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Tobias Diekershoff 95f58426d8 DE: update to the strings 2013-01-19 15:36:09 +01:00
Tobias Diekershoff 406692c7c6 DE: update to the strings 2013-01-18 12:40:44 +01:00
Tobias Diekershoff 01875fff5b PL: update to the strings 2013-01-18 12:40:24 +01:00
Tobias Diekershoff 605f94f790 ZH-CN: update to the strings 2013-01-18 12:39:55 +01:00
friendica 30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
Zach Prezkuta 28c9123ac8 module to show system down message 2013-01-14 16:48:01 -07:00
Tobias Diekershoff e8952541af ZH-CN: update to the strings 2013-01-13 12:55:13 +01:00
friendica 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements 
fixes and tweaks to Smarty processing
 2013-01-12 12:28:14 -08:00
Zach Prezkuta 74caf1a4a7 * Add MIME types for file attachments 
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
 2013-01-12 06:31:32 -07:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
Zach Prezkuta c43ff35fe7 newline at end of header 2013-01-11 10:00:10 -07:00
Zach Prezkuta 1656c63a55 add warning message about automatically generated templates 2013-01-11 09:57:11 -07:00
Zach Prezkuta f24d460522 automatic, command-line conversion 2013-01-11 09:41:45 -07:00
Oliver a543a1a0c2 typo correction 
we don't want to drop Hilde
 2013-01-11 14:15:17 +01:00
pixelroot 637cfdd7cb modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-01-11 10:56:14 +01:00
Zach Prezkuta 1cfc660e6d update a few more Smarty templates 2013-01-10 22:36:44 -07:00
Zach Prezkuta cd017282e4 use Python 2.4 compatible script; update Smarty templates 2013-01-10 22:34:23 -07:00
Michael Vogel 61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. 2013-01-11 01:20:16 +01:00
Tobias Diekershoff df9f3b3db3 ZH-CN: update to the strings 2013-01-10 06:49:35 +01:00
Tobias Diekershoff 5ad382d797 DE: update to the strings 2013-01-10 06:48:54 +01:00
Michael Vogel 82820d8e95 Now the third most likely languages are shown. 
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
 2013-01-09 20:54:18 +01:00
friendica f6a63abd7d update smarty diabook templates bug 525 2013-01-08 14:45:19 -08:00
Tobias Diekershoff e09c31b627 CS: update to the strings 2013-01-05 09:29:26 +01:00
friendica 88cc414355 Merge pull request #570 from annando/master 
Vier, caches and "share" via API
 2013-01-04 15:13:09 -08:00
friendica c0fd572fec Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init 
Finalize theme decision in a module's _init function
 2013-01-04 14:36:47 -08:00
Tobias Diekershoff 602ca63111 PL: update to the strings 2013-01-04 09:18:21 +01:00
Zach Prezkuta fdd142c42e never use profile_load outside of a module's _init() function 2013-01-03 10:47:45 -07:00
Olaf Conradi 1c81409bf8 Merge pull request #573 from oohlaf/fixes 
Don't add src attributes inside acl-template
 2013-01-02 05:32:19 -08:00
Olaf Conradi 2943550fe2 No need to remove data-src attributes 
Better comment string also
 2013-01-02 14:28:13 +01:00
Tobias Diekershoff 68d304cc0f Merge branch 'master' of git://github.com/friendica/friendica 2013-01-02 11:10:59 +01:00
Tobias Diekershoff e56c041579 DE: update to the strings 2013-01-02 11:10:24 +01:00
fermionic 3c49a1b769 Merge pull request #572 from cvogeley/master 
Fix registration form
 2013-01-01 15:12:45 -08:00
Christian Vogeley 457a3b5220 Change templates remove var modifiers 2013-01-01 23:41:26 +01:00
Christian Vogeley 5bfd4cf5c4 Move HTML part of oid to template + replace outside the tpl 2013-01-01 22:40:05 +01:00
Tobias Diekershoff 0472ab7282 DE: update to the strings 2013-01-01 22:25:55 +01:00
Christian Vogeley cde9b6370d Fix registration form 2013-01-01 21:05:24 +01:00
pixelroot 966d786982 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-01-01 16:42:52 +01:00
Zach Prezkuta 1d1c8f4771 replace dashes with underscores in diabook 2012-12-30 20:46:03 -07:00
Olaf Conradi 6a2bd8b29f Don't replace data-src with src in acl-template 
On pageload an empty acl-list-item as template is created and not yet replaced.
Don't change the data-src for src attributes in those images.
 2012-12-31 00:01:15 +01:00
Michael Vogel 348f43157a Vier: Some templates were missing 2012-12-30 22:58:05 +01:00
Michael Vogel e50c0efcdf Merge remote-tracking branch 'upstream/master' 2012-12-30 21:32:18 +01:00
Michael Vogel ad287914c7 Support of "share" through the API. 2012-12-30 21:30:39 +01:00
Olaf Conradi dbf8f711cf Fix browser prefetch in notifications menu 
Fix browser prefetch by substituting data-src with src for images
 2012-12-30 00:28:48 +01:00