friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
8,303 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

2951 Commits

Author SHA1 Message Date
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