keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7534 commits 4 branches 0 tags 179 MiB
Commit graph

2705 commits

Author SHA1 Message Date
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
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
Olaf Conradi
239110a2bc Change acl selection box templating 
Keep dynamic templating in javascript so browsers don't
prefetch non-existing files.
 2012-12-28 23:28:53 +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
friendica
792b4f63e7 remove dashes from variable names in profile_vcard.tpl 2012-12-26 13:20:18 -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
Zach Prezkuta
ce445a385f fix a few more templates for correction conversion to Smarty3 templates 2012-12-24 08:44:26 -07:00
Zach Prezkuta
f0bc8aa1dc change field_*.tpl to * in some missed templates 2012-12-24 07:05:42 -07:00
Michael Vogel
bbec7a1ed9 Vier: added template for vcard 2012-12-24 12:41:00 +01:00
friendica
685a677bc9 Merge pull request #555 from annando/master 
Vier: Changed buttons
 2012-12-24 03:22:43 -08:00
Michael Vogel
e0df845fa3 Vier: Changed the buttons to a flat style that suites more the style of "vier" 2012-12-24 11:07:51 +01:00
Tobias Diekershoff
4cae1fea81 DE: update to the strings 2012-12-24 09:34:47 +01:00
fermionic
80ea740cca Merge pull request #554 from fermionic/20121222-use-smarty-template-engine 
couple more places where file_get_contents was used
 2012-12-23 18:30:45 -08:00
Zach Prezkuta
fdd9ed7e51 couple more places where file_get_contents was used 2012-12-23 19:29:19 -07:00
fermionic
1392c58377 Merge pull request #552 from annando/master 
Vier: Forgotten CSS file and some more design changes
 2012-12-23 17:16:20 -08:00
Michael Vogel
6649cb8e1a Vier: New CSS file adde that acts like a translator between font awesome and the friendica classes 2012-12-23 23:54:28 +01:00
fermionic
974f60d132 Merge pull request #551 from fermionic/20121222-use-smarty-template-engine 
20121222 use smarty template engine
 2012-12-23 05:31:11 -08:00
Zach Prezkuta
232deadfd2 missed a couple more template engine assignments 2012-12-23 06:29:58 -07:00
fermionic
a0d7f7a6d3 Merge pull request #550 from fermionic/20121222-use-smarty-template-engine 
only use Smarty if the view/smarty3/ directory is writable
 2012-12-23 05:19:02 -08:00
Zach Prezkuta
53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
Michael Vogel
3a32372ffa vier: Problems with firefox on small displays fixed 2012-12-23 10:58:04 +01:00
Michael Vogel
ed4eaed7e0 Vier: Content is now aligned left - like before. 2012-12-23 10:47:12 +01:00
Michael Vogel
2e83034fc3 Vier: Background color of popup menus changed 2012-12-23 10:31:46 +01:00
friendica
a29842e301 Merge https://github.com/annando/friendica into annando 
Conflicts:
	view/admin_site.tpl
 2012-12-22 23:02:21 -08:00
Michael Vogel
4b240c9109 vier: Changed color of sidebar links, made the content centered. 2012-12-23 03:26:29 +01:00
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Michael Vogel
b0759e9a9f Some more system settings are now reachable via front-end 
Bugfixing in the mail import when a reply header isn't set correctly
 2012-12-22 16:16:01 +01:00
Michael Vogel
99ca867869 The performance settings and other systems settings (lock file path, temp path) can now be set via the front end. 2012-12-21 18:23:55 +01:00
Michael Vogel
34128925dc "vier": Now the search results containing a link to the original thread 2012-12-21 15:03:22 +01:00
Michael Vogel
61b51d40e7 Vier: disabling the "community" works now 2012-12-21 13:13:22 +01:00
Tobias Diekershoff
5cedd3430f CS: update to the strings 2012-12-21 13:10:03 +01:00
Tobias Diekershoff
e441f3286c DE: update to the strings 2012-12-21 13:09:33 +01:00
Michael Vogel
d7073f7884 Vier: All optical glitches should be removed now. 2012-12-21 13:02:39 +01:00
Michael Vogel
293a794973 "vier": More icons replaced 2012-12-21 03:53:07 +01:00
Michael Vogel
7c7d3fe5de "share" - now the attribut value for the "author" is escaped 2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3 New option to enable and disable the "share" element 
Changes to "vier" to use more "font awesome" icons
 2012-12-21 00:08:58 +01:00
Michael Vogel
8e194cb411 Vier: switching some more icons to "font awesome" 2012-12-20 12:13:37 +01:00
friendica
898f68938a Merge pull request #546 from annando/master 
Bugfix in mail import - use of the "share" element in ostatus and diaspora items
 2012-12-19 22:54:53 -08:00
Michael Vogel
a8aa992102 Vier: Design issues with preview fixed 2012-12-20 04:19:02 +01:00
Michael Vogel
330960f8f7 Vier: Now there are buttons for inserting bbcode elements in the comments 2012-12-20 03:33:36 +01:00
Olaf Conradi
d9d7eb89ed Fix alignment of photo menu 
Remove duplicate definitions
Align menu button to be exactly the same width as the photo
 2012-12-19 19:15:39 +01:00
Olaf Conradi
ee5d2acd42 Fix alignment of location 2012-12-19 19:04:18 +01:00
Olaf Conradi
98c5b6e73b Text box alignment in Smoothly theme 
Make sure comment text boxes stay within their surrounding box.
 2012-12-19 18:27:50 +01:00
Michael Vogel
a86baa372a Mailimport is now realized like a wall-to-wall-post 2012-12-19 15:58:38 +01:00
Michael Vogel
cb3586a280 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	view/de/strings.php
 2012-12-19 12:24:02 +01:00
Michael Vogel
c22f65bafa repeated items from ostatus and diaspora are now using the share-element. 
Some design changes to repeated items in "vier".
 2012-12-19 12:18:52 +01:00
friendica
ecc55221af Merge pull request #545 from annando/master 
New bbcode: "share", caching of photos and some changes to "vier"
 2012-12-19 03:13:42 -08:00
Michael Vogel
4164257cb2 vier: The alt-pager and the birthday- and eventreminder is optically improved 2012-12-17 21:12:11 +01:00
Tobias Diekershoff
a8df4cf04b PL: update to the strings 2012-12-17 11:14:26 +01:00
Tobias Diekershoff
1353e8ef4c DE: update to the strings 2012-12-17 11:11:32 +01:00
Michael Vogel
a6b1275f16 Merge remote-tracking branch 'upstream/master' 2012-12-17 10:32:53 +01:00
Michael Vogel
9c0de28622 bbcode: New element "share" for shared content 
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
 2012-12-17 03:01:40 +01:00
Michael Vogel
d253d59668 vier: Added Delegations and optical changes. 2012-12-15 14:39:37 +01:00
Michael Vogel
a61ac769a0 vier: Expanding and collapsing now works 2012-12-15 11:25:52 +01:00
friendica
6faadc9662 anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported. 2012-12-13 14:15:18 -08:00
friendica
4793ebb141 change profile photo link on profile edit page 2012-12-07 16:02:40 -08:00
Tobias Diekershoff
5a634f3d9b NB_NO: update to the strings 2012-12-04 11:09:48 +01:00
Tobias Diekershoff
62d4034a5a RU: update to the strings 2012-12-04 11:06:02 +01:00
Tobias Diekershoff
fc8c01750b PT-BR: update to the strings 2012-12-04 11:03:23 +01:00
Tobias Diekershoff
71054f1483 RU: update to the strings 2012-12-03 09:35:07 +01:00
tobiasd
23c873fc51 Merge pull request #542 from annando/master 
Some minor changes to "vier"
 2012-12-02 23:49:06 -08:00
Michael Vogel
5635fe250c Merge remote-tracking branch 'upstream/master' 2012-12-03 08:30:49 +01:00
Michael Vogel
d548d1943f vier: maximum width of comments defined 2012-12-03 08:29:41 +01:00
Vasya Novikov
480af990ec added translations where they were empty 2012-12-03 00:14:34 +04:00
Tobias Diekershoff
daa56a94d3 DE: update to the strings 2012-11-30 09:17:58 +01:00
Tobias Diekershoff
af1ebc932f FR: update to the strings 2012-11-30 09:17:29 +01:00
Thomas Willingham
785fa1e070 Remove unsupported tag from Darkzero-NS since I have been supporting it. 2012-11-29 02:33:11 +00:00
Thomas Willingham
512729073b Unmark Diabook experimental 2012-11-27 17:14:13 +00:00
Thomas Willingham
8c3ea4b4d4 Add max_daily_registrations to admin panel. 2012-11-27 17:13:32 +00:00
Thomas Willingham
7de455602c Revert Diabook. 2012-11-27 16:28:12 +00:00
Thomas Willingham
95322ff5f4 Diabook - of all the things to miss...wall-item-content. 2012-11-26 05:49:13 +00:00
Thomas Willingham
fa5d25ec7a Diabook - better 1024 resolution support. 2012-11-26 04:38:19 +00:00
Thomas Willingham
b0b4baa331 Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list. 2012-11-26 02:11:19 +00:00