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
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
Alex
7ae1e4620d
Merge pull request #476 from pixelroot/master
...
new funktion
2012-09-14 10:07:17 -07: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
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
cb1c9de069
quattro: lilac color schema
2012-09-14 17:01:26 +02:00
6c44125fb5
DE: update to the strings
2012-09-14 15:46:14 +02:00
c8d0293e9e
Merge branch 'master' of https://github.com/friendica/friendica
2012-09-14 15:36:15 +02:00
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
pixelroot
1c4bea295f
new file: view/theme/smoothly/default.php
2012-09-14 09:33:47 +02:00
pixelroot
d1984c4c64
modified: view/theme/smoothly/nav.tpl
...
modified: view/theme/smoothly/style.css
2012-09-14 09:33:21 +02:00
pixelroot
bff9c3d460
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-09-14 08:50:10 +02:00
friendica
20938d07cd
typo on previous checkin - set max number of images for an inserted link, default 2.
2012-09-13 23:01:10 -07:00
Domovoy
a31c779a15
Transform prefixed elements to classic ones
2012-09-14 07:59:54 +02:00
Domovoy
09413a0f0a
Better integration with the existing code
2012-09-14 05:50:35 +02:00
Domovoy
f9a9b70123
Detect the namespace uri from token name
2012-09-14 05:30:21 +02:00
friendica
32d4a359f1
reverse the default newuser privacy setting to public. Sites can over-ride.
2012-09-13 19:11:07 -07:00
friendica
269bb75a14
Merge https://github.com/friendica/friendica into pull
2012-09-13 17:00:47 -07:00
friendica
d19a3b8324
provide separate hashtag and mentions for themes in addition to composite tags
2012-09-13 16:59:25 -07:00
friendica
aa37b0cb0f
rev update
2012-09-13 16:58:06 -07:00
Thomas Willingham
1957aa8f0d
Merge branch 'master' of https://github.com/friendica/friendica
2012-09-13 20:52:06 +01:00
Thomas Willingham
4b8f3a4194
Friendicaland
2012-09-13 20:51:34 +01:00
Thomas Willingham
290da6c845
Merge pull request #469 from pixelroot/master
...
Theme Smoothly
2012-09-13 07:59:16 -07:00
pixelroot
0cc661dd9c
modified: view/theme/smoothly/style.css
2012-09-13 16:50:55 +02:00
pixelroot
664680cdd8
modified: view/theme/smoothly/style.css
2012-09-13 16:30:12 +02:00
friendica
d3699498ac
Merge pull request #468 from pixelroot/master
...
Theme Smoothly
2012-09-13 03:50:55 -07:00
pixelroot
a1ed9c72c2
modified: view/theme/smoothly/star.png
...
modified: view/theme/smoothly/theme.php
2012-09-13 11:41:14 +02:00
