nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
8172 commits 2 branches 55 tags 148 MiB
Commit graph

1646 commits

Author SHA1 Message Date
tobiasd
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
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
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
tobiasd
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
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
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
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
Michael Vogel
3e58060b30 API: beautify the output of repeated items 
Vier: Birthday reminder looks better
 2013-02-15 20:14:45 +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
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
zottel
7db626b1b5 also reset network in mobile themes, smarty3 updates 2013-02-01 20:37:16 +01:00
Zach Prezkuta
7d3a923294 script for minifying javascript files 2013-01-31 19:05:27 -07: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
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
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
friendica
30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08: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
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
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
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
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
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
Christian Vogeley
457a3b5220 Change templates remove var modifiers 2013-01-01 23:41:26 +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
Olaf Conradi
94c8d7693f Keep html in template, use data attribute for img 
Revert previous changes to fix browser preloading a template variable as image.
Images use a data attribute within templates as src.
Javascript will substitute them.
 2012-12-29 23:44:26 +01:00
Olaf Conradi
a41692120e Also change acl stuff in the other themes 2012-12-28 23:51:40 +01:00
Michael Vogel
6f6b1f95c8 vier: With IE there are no borders around images anymore 
bbcode: Multiple new lines are now reduced
 2012-12-28 11:31:30 +01:00
Zach Prezkuta
8066f2109e update smarty templates 2012-12-27 12:23:37 -07:00
Zach Prezkuta
659ae4ed04 incremental improvements 2012-12-27 12:20:47 -07:00
Zach Prezkuta
b6981768ee remove more dashes in templates 2012-12-27 09:38:42 -07:00
Michael Vogel
763504f0d5 Vier: Now the language of a post is shown 2012-12-27 01:05:59 +01:00
friendica
e189e6582a fix profile_vcard all themes 2012-12-26 13:38:08 -08:00
Zach Prezkuta
263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
Zach Prezkuta
189c8ccf6f some missed templates 2012-12-25 12:28:24 -07:00
Zach Prezkuta
e736abd372 small fixes; update smarty3 templates 2012-12-25 12:05:46 -07:00
Zach Prezkuta
11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
Michael Vogel
5bc6896671 The caches are now cleared only once an hour. 2012-12-25 12:52:30 +01:00
fermionic
6603758a5e Merge pull request #558 from fermionic/20121222-use-smarty-template-engine 
fix a few more templates for correct conversion to Smarty3 templates
 2012-12-24 07:47:06 -08:00