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

8276 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Willingham 9cabcad36c Add title bar notifications to Smoothly 2012-09-17 14:53:17 +01:00
Thomas Willingham dbdc4bcb67 Gitignore seems to have been overwritten with somebody's personal copy - put the old one back. 2012-09-17 14:52:26 +01:00
Fabrixxm 6aa45fb9cc admin: Don't allow to block or delete site admin in users admin page. fix bug 471 2012-09-17 08:48:43 -04:00
Alex f558a1fe8d Merge pull request #482 from pixelroot/master 
bug fix
 2012-09-17 05:12:53 -07:00
pixelroot ede6b4ad12 modified: view/theme/smoothly/style.css 2012-09-17 14:16:13 +02:00
pixelroot 176fe0351a new file: view/theme/smoothly/shiny.png 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-17 13:49:09 +02:00
Alex 01daaafc92 Merge pull request #481 from pixelroot/master 
Better mark new posts
 2012-09-17 04:46:00 -07:00
pixelroot cd3938dfda new file: view/theme/smoothly/default.php 
new file:   view/theme/smoothly/footer.tpl
	new file:   view/theme/smoothly/header.tpl
	modified:   view/theme/smoothly/nav.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-09-17 11:22:12 +02:00
Alex 06c9330c5e Merge pull request #480 from pixelroot/master 
Bug fixes
 2012-09-17 02:20:07 -07:00
friendica 640f5306f5 fix item_id table 2012-09-17 01:34:05 -07:00
Fabrixxm 6deb070890 quattro: first work on font size options 2012-09-17 03:29:58 -04:00
friendica 59d98647fb Merge https://github.com/friendica/friendica into pull 2012-09-16 19:20:40 -07:00
friendica 5b325935c2 rev update 2012-09-16 19:19:50 -07:00
friendica 02ed81d8f9 bug 479 - typo in database.sql 2012-09-16 19:19:09 -07:00
Zach Prezkuta 364f56e8bd dont insert images larger than scale level 2 2012-09-16 19:07:12 -06:00
fermionic e6fc21e9fd Merge pull request #478 from fermionic/frost-improvements 
Frost improvements
 2012-09-16 17:59:01 -07:00
Zach Prezkuta ab10a7b56b missed one 2012-09-16 18:57:04 -06:00
Zach Prezkuta 3c7419ec57 various bug fixes 2012-09-16 18:56:31 -06:00
Tobias Diekershoff d29da99dbd frost: added some missing baseurls to nav.tpl 2012-09-16 18:33:55 +02:00
Thomas Willingham f198953790 Merge branch 'master' of https://github.com/friendica/friendica 2012-09-16 16:17:43 +01:00
Thomas Willingham 225c9bb30e Make 'Friendika' 'Friendica' in open search. 2012-09-16 16:16:22 +01:00
Tobias Diekershoff 89981b33bb DE: update to the strings 2012-09-16 10:48:29 +02:00
friendica 2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly 2012-09-15 20:21:17 -07:00
friendica ee5ed6b963 Merge https://github.com/friendica/friendica into pull 2012-09-15 15:24:28 -07:00
friendica 669d2b890e rev update - add cancel markup to editor 2012-09-15 15:23:15 -07:00
Tobias Diekershoff 21d685b21c DE: update to the strings 2012-09-15 10:38:08 +02:00
friendica e581c34760 Merge pull request #470 from CyberDomovoy/html5-treebuilder-namespace-error 
Detect the namespace uri from token name
 2012-09-14 20:21:29 -07:00
friendica 75b92b52d8 Merge pull request #477 from fermionic/private-image-failure 
Private image failure
 2012-09-14 20:21:05 -07:00
Zach Prezkuta 8a4dcc28c1 make size search less greedy 2012-09-14 18:33:07 -06:00
Zach Prezkuta f445ed47df fix permissions for uploaded images with size specified 2012-09-14 18:22:56 -06:00
pixelroot 816680ca85 new file: view/theme/smoothly/bottom.tpl 
new file:   view/theme/smoothly/js/jquery.autogrow.textarea.js
	new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.js
	new file:   view/theme/smoothly/js/modernizr.custom.2.5.3.min.js
 2012-09-14 19:08:39 +02:00
pixelroot 3c846547f7 modified: view/theme/smoothly/style.css 2012-09-14 19:08:21 +02:00
Alex 7ae1e4620d Merge pull request #476 from pixelroot/master 
new funktion
 2012-09-14 10:07:17 -07:00
pixelroot 6537a94b1a new file: view/theme/smoothly/down.png 2012-09-14 17:55:27 +02:00
pixelroot a300973084 modified: view/theme/smoothly/style.css 2012-09-14 17:55:17 +02:00
Alex 5d22b13242 Merge pull request #475 from pixelroot/master 
Bugs
 2012-09-14 08:53:27 -07:00
Tobias Diekershoff cb1c9de069 quattro: lilac color schema 2012-09-14 17:01:26 +02:00
Tobias Diekershoff 6c44125fb5 DE: update to the strings 2012-09-14 15:46:14 +02:00
Tobias Diekershoff c8d0293e9e Merge branch 'master' of https://github.com/friendica/friendica 2012-09-14 15:36:15 +02:00
Tobias Diekershoff 882f437149 quattro: mail link to profile page 2012-09-14 15:35:40 +02:00
friendica 8497c6782e Merge https://github.com/friendica/friendica into pull 2012-09-14 06:05:22 -07:00
friendica 39b296a87d ostatus disabled typo 2012-09-14 06:04:25 -07:00
pixelroot 252e112ad5 modified: view/theme/smoothly/style.css 2012-09-14 12:46:32 +02:00
Alex 98540b630e Merge pull request #474 from pixelroot/master 
Bug fix
 2012-09-14 03:43:48 -07:00
pixelroot e78b86f534 modified: view/theme/smoothly/style.css 2012-09-14 11:57:13 +02:00
Alex 9c7d5d42e1 Merge pull request #473 from pixelroot/master 
Editor redesign
 2012-09-14 02:54:30 -07:00
pixelroot bdc5a3ab29 deleted: view/theme/smoothly/group_edit.tpl 2012-09-14 10:16:35 +02:00
Alex ac0ad8fecf Merge pull request #472 from pixelroot/master 
Group-Edit bug
 2012-09-14 01:14:48 -07:00
pixelroot d002573543 deleted: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/nav.tpl
 2012-09-14 09:55:54 +02:00
Alex 2a404ae6dd Merge pull request #471 from pixelroot/master 
Theme Smoothly
 2012-09-14 00:54:54 -07:00