Commit graph

7143 commits

Author SHA1 Message Date
friendica
82678e7bbf bad html in view/follow.tpl 2012-09-19 03:17:41 -07:00
friendica
490c98b7db fix events 2012-09-19 00:44:37 -07:00
friendica
0b59d30e34 more infrastructure for ignored events 2012-09-18 22:49:05 -07:00
friendica
66081201bc allow "subscribe to thread" activities to exist without displaying them. 2012-09-18 20:12:55 -07:00
friendica
fa14723ef5 Merge https://github.com/friendica/friendica into pull 2012-09-18 17:44:38 -07:00
friendica
5cad3e114a give themes more control over events/birthdays and provide them as notifications 2012-09-18 17:43:09 -07:00
friendica
8596a275fc rev update 2012-09-18 17:24:45 -07:00
friendica
6ebd56012a Merge pull request #479 from fermionic/album-image-inserted-too-large
dont insert images larger than scale level 2
2012-09-18 15:46:41 -07:00
Thomas Willingham
96d6d6b988 Pull request #487 2012-09-18 16:15:36 +01:00
Alex
61eb884a20 Update view/theme/smoothly/bottom.tpl 2012-09-18 13:13:05 +03:00
Zach Prezkuta
cd25573038 select based on dimensions instead of scale level 2012-09-17 21:46:36 -06:00
friendica
863e036b76 Merge pull request #483 from fabrixxm/bug471
admin: Don't allow to block or delete site admin in users admin page.
2012-09-17 17:39:32 -07:00
Thomas Willingham
69182360ef Merge pull request #486 from cvogeley/master
Show notifications in title, ignore OSX .DS_Store files
2012-09-17 14:44:17 -07:00
Christian Vogeley
cf2016e1a6 ignore OSX .DS_Store files 2012-09-17 23:11:42 +02:00
Christian Vogeley
4b8fc897e6 remove .DS_Store 2012-09-17 23:03:53 +02:00
Christian Vogeley
c024ed601e Remove and ignore .DS_Store 2012-09-17 23:03:34 +02:00
808b0f2ed8 ES: bringing the strings to 100% thx to csolisr 2012-09-17 21:52:21 +02:00
Christian Vogeley
318bc23e8a Add notifications in title 2012-09-17 20:39:34 +02:00
Thomas Willingham
e34b8e6d46 Pull request #484 (Smoothly) 2012-09-17 18:37:44 +01:00
tomtom84
55b741a4eb Merge pull request #485 from tomtom84/master
Corrected titlebar notifications in Diabook.
2012-09-17 08:58:55 -07:00
tomtom84
68c2316ce3 Corrected titlebar notifications in Diabook 2012-09-17 17:54:07 +02:00
Thomas Willingham
11eebf7091 Add titlebar notifications to Dispy. 2012-09-17 14:54:40 +01:00
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
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
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
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