bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
9195 commits 4 branches 62 tags 178 MiB
Commit graph

3232 commits

Author SHA1 Message Date
fabrixxm 22c45b9bf1 Merge pull request #938 from annando/master 
API: Don't show own posts in mentions, some "vier" changes and provider name for diaspora
 2014-04-22 16:15:42 +02:00
Michael Vogel b6384ec5be The postal code wasn't displayed correctly. 2014-04-22 15:53:26 +02:00
Michael Vogel 6e7d8b87bb Vier: attached link descriptions (type-link, ...) are redesigned to make it look more modern. 2014-04-22 01:03:08 +02:00
Michael Vogel 9185321c8b Diaspora-XML-Templates: Added provider name and some rearrangements to fit the exact order of the elements in diaspora (only for the beauty) 2014-04-22 01:01:21 +02:00
fabrixxm 84189ac775 Merge pull request #932 from annando/master 
Preparation for bidirectional statusnet sync, functions moved from addons into the core and some converting stuff
 2014-04-07 09:53:47 +02:00
Tobias Diekershoff 0d46dca4c1 ES: update to the strings 2014-04-06 08:01:23 +02:00
Tobias Diekershoff 90661a3cdc RU: update to the strings 2014-04-06 07:58:32 +02:00
Tobias Diekershoff dd0f35d443 NL: update to the strings 2014-04-06 07:57:06 +02:00
Michael Vogel 73f0496127 Vier: Added treatment of videos like links. (See the changes in the "parse url" section) 2014-04-04 11:03:34 +02:00
fabrixxm 29092ace44 Merge pull request #927 from annando/master 
Massive SQL stuff
 2014-04-04 07:28:06 +00:00
Michael Vogel a50484c27d Vier: Larger font for content. 2014-03-18 22:52:19 +01:00
Michael Vogel 49e16b0612 Vier: Fading effects for tags, borders for links 2014-03-16 17:24:10 +01:00
Michael Vogel 51bf7f7d17 Vier: The shadows are reduced a little bit. 2014-03-09 09:22:44 +01:00
Tobias Diekershoff d29c981aa2 Merge pull request #919 from annando/master 
plink, disabling features, triming the content of parsed urls
 2014-03-02 08:31:03 +01:00
Michael Vogel 2b5345323f "vier": Several design changes. New option for coloured network items. 2014-03-02 01:29:20 +01:00
Tobias Diekershoff dd70b28144 RU: update to the strings 2014-02-25 08:22:22 +01:00
Tobias Diekershoff 0eec22f656 Merge pull request #914 from annando/master 
Vier, API and Twitter cards
 2014-02-24 07:21:15 +01:00
Michael Vogel 7792c5f5f0 Vier: forgot to add template ... 2014-02-23 15:58:22 +01:00
Michael Vogel a4ecf74a5d Vier: Added config.php 2014-02-23 15:57:27 +01:00
Michael Vogel f663676cca Vier: Option to switch between shadow style and flat style. 2014-02-22 15:48:57 +01:00
Tobias Diekershoff 5762ed2cdc Merge pull request #913 from friendica/20140222 
RU: update to the strings
 2014-02-22 12:46:55 +01:00
Tobias Diekershoff b8aa366496 RU: Update to the strings 2014-02-22 12:40:45 +01:00
Tobias Diekershoff 623bf1c4d1 Merge pull request #912 from annando/master 
More compatible "Vier", more speed and problems with some parsed characters
 2014-02-17 08:00:21 +01:00
Michael Vogel 83c89bf17c Vier should now work better on some older browsers 2014-02-16 17:37:56 +01:00
Tobias Diekershoff 3bbe7a75ec Merge pull request #911 from annando/master 
target="_blank" and api improvements
 2014-02-16 14:15:44 +01:00
Michael Vogel 01971428aa target="_blank" instead of target="external-link" 2014-02-11 23:42:06 +01:00
fabrixxm 99380bc60d quattro: css for reshare moved to LESS file 2014-02-05 20:48:40 +01:00
Tobias Diekershoff f94728a13e Merge pull request #909 from annando/master 
CSS-improvements: shared items and shared links
 2014-02-04 23:11:24 -08:00
Michael Vogel 4591790ea7 shared items and shared links for duepuntozero, quattro and smoothly 2014-02-05 01:15:08 +01:00
Michael Vogel 81f216f347 Diabook: Support for shared messages and shared links 2014-02-05 00:41:19 +01:00
Tobias Diekershoff ebc04e8506 Merge pull request #906 from annando/master 
API now supports entities/Design changes to "vier"
 2014-02-02 01:48:47 -08:00
Michael Vogel 6c46c8333d Vier: Adding some shadows. In the thread view showing the application when hovering over the network name (less information is sometimes more) 2014-02-02 09:57:31 +01:00
Tobias Diekershoff af32740c04 Merge pull request #904 from annando/master 
vier: Quick fix for a missing file (taken from quattro at the moment)
 2014-01-28 21:08:01 -08:00
Michael Vogel 2be9e2f246 vier: Quick fix for a missing file (taken from quattro at the moment) 2014-01-28 22:55:19 +01:00
Tobias Diekershoff d473cd9bc9 Merge pull request #902 from annando/master 
schema.org and oembed
 2014-01-28 09:28:43 -08:00
pixelroot c0eada4f03 new file: view/theme/smoothly/unsupported 2014-01-27 14:37:07 +01:00
pixelroot c3be0e9295 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2014-01-27 14:36:38 +01:00
Michael Vogel a7079d4327 Adding metadata in the schema.org format. 2014-01-26 09:58:41 +01:00
Tobias Diekershoff dd356c3d81 NB NO: update to the strings 2014-01-23 07:51:07 +01:00
Tobias Diekershoff aa22598b80 Merge pull request #900 from annando/master 
Beautifiying export of shared posts to other networks
 2014-01-18 22:23:59 -08:00
Michael Vogel de4d0765cb Beautifiying export of shared posts to other networks 2014-01-18 21:32:14 +01:00
fabrixxm d1befd9069 Merge pull request #890 from tobiasd/bbcode_in_registertext 
add bbcode support for the page register textfield (close #871)
 2014-01-18 01:02:02 -08:00
Tobias Diekershoff efbd20310a IS: update to the update_fail_eml template 2014-01-16 10:55:31 +01:00
Tobias Diekershoff 2cc72a1bc7 removed copy and paste leftover 2014-01-13 14:49:49 +01:00
Tobias Diekershoff 1e87780f5d removed copy and paste leftover 2014-01-13 14:45:37 +01:00
Tobias Diekershoff b84502c4e6 move <div> to the register.tpl 2014-01-13 14:40:26 +01:00
Tobias Diekershoff 7c8e2e46d8 Merge pull request #894 from tobiasd/diabook_rememberme 
added remember me checkbox to diabook login template
 2014-01-12 23:49:43 -08:00
Tobias Diekershoff d4d3fa90e7 added remember me checkbox to diabook login template 2014-01-13 08:48:19 +01:00
Oliver e433dfad71 Quick fix: star and lock position on starred posts 2014-01-12 12:42:56 +01:00
Tobias Diekershoff 964f2bc4b1 FR: update to the strings 2014-01-09 08:37:10 +01:00
Tobias Diekershoff 6e59cc809e ZH_CN: update to the strings 2014-01-07 08:36:41 +01:00
Tobias Diekershoff fb0c522b50 CS: update to the strings 2014-01-07 08:32:26 +01:00
Michael Vogel 8eedebfee3 Cleaning up some changes from the merge 2014-01-05 16:28:42 +01:00
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/crepair.php
 2014-01-05 16:22:42 +01:00
Michael Vogel 28df35052a Send notifications for each new post of a contact, option for creating a summary for a feed post 2014-01-05 16:10:02 +01:00
fabrixxm b0e8dbc4da Merge pull request #864 from fabrixxm/acl_automention 
Acl automention
 2014-01-03 06:09:12 -08:00
fabrixxm ad5a47aecf add fetaure switch for acl-automention 2014-01-03 14:40:43 +01:00
Tobias Diekershoff a5aa4bfbde DE: update to the strings 2014-01-01 11:31:05 +01:00
fabrixxm 7b5018fb76 Merge pull request #872 from annando/master 
API: Supporting twidere, better supporting of the network field in the item table
 2013-12-27 00:15:44 -08:00
Michael Vogel 4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Tobias Diekershoff 25d83f780d only show the remote_self option if admin allows it 2013-12-22 19:30:09 +01:00
Tobias Diekershoff f515def280 added remote_self as option to the contact repair dislog 2013-12-22 17:05:49 +01:00
Tobias Diekershoff 22a6c72b31 added option to the admin panel to allow users to set the remote_self flag 2013-12-22 16:14:34 +01:00
Tobias Diekershoff f93a4e13b8 PL: update to the strings 2013-12-21 16:32:06 +01:00
Fabrixxm 9a94c35120 acl selector add and remove mentions when a forum is selected. 2013-12-18 10:18:26 -05:00
Fabrixxm 06e8f31695 change action container div class to id. fix bug in quattro theme 2013-12-18 06:38:57 -05:00
Fabrixxm 9febcedf93 user contacts: fix #797 , add searching in url and nickname, add batch actions 2013-12-17 05:19:06 -05:00
Tobias Diekershoff 68e0324c1b Merge pull request #853 from annando/master 
Bugfix of the previous bugfix :)
 2013-12-11 23:23:30 -08:00
Fabrixxm 9474a0deed Add better support to small screen to duepuntozero theme. 
This close #823. It also add some styles for screens less than 960px.
It's not a mobile theme, but should be better to see in case.
 2013-12-11 05:25:41 -05:00
Michael Vogel d487cb2078 vier: Screenshot updated 2013-12-10 20:56:50 +01:00
Michael Vogel bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Michael Vogel 3e5b9e97e7 New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout. 2013-12-04 23:46:51 +01:00
Tobias Diekershoff acd29f22a0 Merge pull request #842 from annando/master 
mail settings: inflate/deflate settings
 2013-12-01 02:26:36 -08:00
Michael Vogel 9c2b1d39ea mail settings: inflate/deflate settings 2013-11-30 21:32:44 +01:00
Tobias Diekershoff bd2f1f8cb0 Merge pull request #833 from tobiasd/adduserhint 
add the hint also as a placeholder in the add contact form (issue #786)
 2013-11-19 02:34:54 -08:00
Tobias Diekershoff 32633d1534 PT-BR: update to the strings 2013-11-19 09:40:16 +01:00
Tobias Diekershoff dfc09f4ba1 DE: update to the strings 2013-11-19 09:39:54 +01:00
Tobias Diekershoff d4c56b227d add the hint also as a placeholder in the add contact form (issue #786) 2013-11-17 16:09:44 +01:00
Fabrixxm 0414e0a316 More "relocate": 
button in user's setting to resend relocate message to contacts
option in admin's site setting to relocate a server
 2013-11-13 06:07:49 -05:00
fabrixxm 15bb34caf0 Merge pull request #820 from maase2/patch-13 
Update style.css
 2013-11-11 01:49:37 -08:00
Tobias Diekershoff 825ecad89d CS: update to the strings 2013-11-08 19:43:03 +01:00
maase2 e010eb480e Update style.css 
Add warning-message class
 2013-11-08 14:34:12 +01:00
Tobias Diekershoff c53b483293 DE: update to the strings 2013-11-07 10:53:47 +01:00
Tobias Diekershoff 7d1a6cc1d6 Merge pull request #803 from annando/master 
SQL performance and reduction of database warnings
 2013-11-07 01:03:31 -08:00
Tobias Diekershoff d1a0206cdd Merge pull request #806 from maase2/patch-6 
Update style.css
 2013-11-03 23:37:05 -08:00
maase2 50f69ff23e Update style.css 
This is for responsive Webdesign.
 2013-11-03 11:27:49 +01:00
maase2 e6a81b47e0 Update style.css 
This will fix the profile selector. It will be bring it on the left side.
 2013-11-03 10:57:58 +01:00
Michael Vogel 711972a166 Merge remote-tracking branch 'upstream/master' 2013-10-25 23:35:03 +02:00
Michael Vogel 0ffeb4cf92 New field "network" in item table to speed up the system. 2013-10-25 23:33:53 +02:00
Michael Vogel 0cfeee2e47 Merge pull request #789 from tobiasd/20131020 
added options to admin panel
 2013-10-22 14:02:27 -07:00
Fabrixxm 0ccad6d7d2 quattro theme: version bump 2013-10-22 13:55:36 -04:00
Fabrixxm 900b90ad85 quattro theme update: 
icon and notification for introductions
icon and notification for private messages
correct link to edit profile with single profile enabled
 2013-10-22 13:53:12 -04:00
Tobias Diekershoff 8faeee9965 added config->info and system-suppress_language options to the admin panel 2013-10-20 16:17:39 +02:00
Tobias Diekershoff c308bb9042 Merge pull request #788 from annando/master 
Infinite scroll, "new share" is now standard
 2013-10-20 06:04:25 -07:00
Michael Vogel 2e64802866 Merge remote-tracking branch 'upstream/master' 2013-10-20 13:01:24 +02:00
Michael Vogel e70b110984 Switching from "new share" to "old share" 2013-10-15 00:49:49 +02:00
Michael Vogel 693b6d0fd4 Infinite scroll: At the end of the network page new content is loaded automatically 2013-10-15 00:43:11 +02:00
Tobias Diekershoff a2a12a429f FR: update to the strings 2013-10-07 08:15:00 +02:00
Tobias Diekershoff 8bd6858bfa Merge branch 'master' of git://github.com/friendica/friendica 2013-10-07 07:46:39 +02:00
Michael Vogel 8adc1bd703 Vier: Improved scrollbar when the "aside" area is to short. 2013-10-04 11:12:29 +02:00
Oliver 53040c0814 Update style.css 
no opacity for remote-link icon
 2013-09-24 09:18:29 +02:00
Tobias Diekershoff b178317cbb Merge pull request #774 from silke/frost-mobile-share-link 
Transferred link link from Neptune theme (by 23n) to frost-mobile
 2013-09-23 21:36:47 -07:00
Silke Meyer 5075770654 Transferred link link from Neptune theme (by 23n) to frost-mobile 2013-09-24 00:28:35 +02:00
Tobias Diekershoff a4d51c9195 FR: update to the strings 2013-09-20 14:48:38 +02:00
tomtom84 ca39c2acb4 - diabook update 
-- adjust nav-bar, depending to userstatus
 2013-09-11 19:14:41 +02:00
tomtom84 9ddca9425d update diabook-theme 
-- fixed contact-edit-page
-- some css-fixes
 2013-09-08 04:30:55 +02:00
tomtom84 06994b94b2 - update diabook-theme: 
-- removed twitter-box from right col, because api is outdated
-- some css-fixes
 2013-09-07 03:28:52 +02:00
tomtom84 4747145ca9 add a readme to diabook-folder and update my fork 2013-09-06 20:51:33 +02:00
tomtom84 8c0c807a59 add a readme to diabook-folder 2013-09-06 20:51:33 +02:00
Silke Meyer 9152198927 Added link to import a profile im register tpl 2013-09-04 20:51:04 +02:00
Tobias Diekershoff d21496454b NL: update to the strings 2013-08-30 14:42:40 +02:00
Tobias Diekershoff b0886d2d85 NL: update to the strings 2013-08-20 09:56:47 +02:00
Fabrixxm e8171a03d1 move register_adminadd_eml.tpl to view/en/ 2013-08-08 11:35:12 -04:00
Tobias Diekershoff 1b3961286d PT BR: update to the strings 2013-08-06 20:12:37 +02:00
fabrixxm 3e4c4f53f7 Merge pull request #750 from zered/deleted_user_disp 
Deleted user display in admin page
 2013-08-05 04:24:54 -07:00
Zered 82972be85e Adding a "User waiting for permanent deletion" table in admin page 2013-08-05 06:08:33 +02:00
Tobias Diekershoff 14474f965f NL: update to the strings 2013-08-04 08:40:55 +02:00
Tobias Diekershoff 7169906a3a NL: update to the strings 2013-07-31 06:41:11 +02:00
Tobias Diekershoff 7f36a6fcbd PL: update to the strings 2013-07-22 07:53:02 +02:00
Tobias Diekershoff 0972189372 allow admins to add a new user from the admin panel (eventually fixing oldbug #383) 2013-07-21 08:46:57 +02:00
Tobias Diekershoff d23e934d21 BG: update for the strings 2013-07-12 09:37:51 +02:00
Tobias Diekershoff 497cee4311 BG: update for the strings 2013-07-12 09:37:26 +02:00
Tobias Diekershoff c6ac24ba00 IT: update for the strings 2013-07-12 09:37:09 +02:00
Tobias Diekershoff 1f68ffe3d1 NL: update to the strings 2013-07-08 14:42:56 +02:00
fabrixxm 8b9ae53242 Merge pull request #713 from annando/master 
ejabberd and friendica
 2013-07-05 12:40:30 -07:00
Tobias Diekershoff 49785130c2 NL: update of the strings 2013-07-05 12:14:34 +02:00
Tobias Diekershoff b9093c300f FR: update of the strings 2013-07-05 12:14:20 +02:00
Tobias Diekershoff 3185e49042 PT_BR: update of the strings 2013-07-05 12:13:43 +02:00
Tobias Diekershoff 93dfdf85e8 NL: translation added from transifex 2013-06-29 10:45:25 +02:00
Tobias Diekershoff 790257c6c2 CS: update to the strings 2013-06-28 14:36:21 +02:00
Tobias Diekershoff 2f6d0dee7b DE: update to the strings 2013-06-28 14:35:53 +02:00
Tobias Diekershoff f87631b3f7 ZH_CN: update to the strings 2013-06-28 14:33:33 +02:00
Tobias Diekershoff 95ee7a3bdc PL: update to the strings 2013-06-28 14:31:57 +02:00
Tobias Diekershoff bb59c9c32a CA: update to the strings 2013-06-27 07:29:18 +02:00
Tobias Diekershoff 42644f6011 DE: update to the strings 2013-06-26 10:42:08 +02:00
Tobias Diekershoff dbc44f2b56 BG: added translation of the strings from transifex 2013-06-24 19:04:46 +02:00
Tobias Diekershoff 10b8ab5e89 BG: added translation of the strings from transifex 2013-06-24 19:04:25 +02:00
Michael Vogel 9bbf60ac9b Vier: A little rearrangement of the menu order. 2013-06-23 00:26:04 +02:00
Michael Vogel bd7abe210c Vier: Introductions are now shown. The popup menu when editing a profile is visible again. 2013-06-23 00:07:21 +02:00
Tobias Diekershoff 7e23221f95 FR: update to the strings 2013-06-22 07:13:44 +02:00
Tobias Diekershoff 756a1c9c52 IT: update to the strings 2013-06-21 09:00:16 +02:00
Tobias Diekershoff 6d58a5888a NB_NO: update to the strings 2013-06-21 08:56:16 +02:00
Tobias Diekershoff 443d170016 NB_NO: update to the strings 2013-06-20 07:50:19 +02:00
Tobias Diekershoff ecf3c2c9ce NB_NO: update to the strings 2013-06-19 10:57:59 +02:00
fabrixxm 5ac4d06036 Merge pull request #703 from fabrixxm/master 
fix pagination template
 2013-06-17 01:30:00 -07:00
Fabrixxm c82e5fde0a pagination: fix template 2013-06-17 04:28:34 -04:00
fabrixxm 7f2d396e6f Merge pull request #695 from fabrixxm/master 
move html from paginate functions to template
 2013-06-17 00:52:30 -07:00
Tobias Diekershoff f80567ce53 ZH-CN: update to the strings 2013-06-16 14:51:59 +02:00
Tobias Diekershoff 176cb241c2 IT: update to the strings 2013-06-16 14:51:17 +02:00
Tobias Diekershoff 49f33c8841 NB_NO: update to the strings 2013-06-16 14:50:22 +02:00
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
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