Paolo T
82fb1ca0ca
Merge pull request #8 from friendica/master
...
merging red master into nuvola.red
2015-03-22 16:34:40 +01:00
Mario Vavti
e345d6793d
move the maintenance part to include/sharedwithme.php
2015-03-22 16:29:57 +01:00
Mario Vavti
47c055e7f3
do not override item_private here anymore
2015-03-22 14:24:07 +01:00
friendica
1b17b0193e
fix multiple vote issues
2015-03-21 17:14:12 -07:00
friendica
b298bc8834
Merge https://github.com/friendica/red into pending_merge
2015-03-21 16:47:46 -07:00
friendica
a2e3ca6fd8
add loadtime search to channel and fix it for home. display and search need further investigation
2015-03-21 16:46:28 -07:00
RedMatrix
b6b0e00f4c
Merge pull request #934 from dawnbreak/master
...
Bugfix und variable initialization.
2015-03-22 08:39:28 +11:00
Klaus Weidenbach
9d143e3f2d
Fixed an exit of a loop in builtin_activity_puller().
...
There was a "$return", but I think it should be "return".
2015-03-21 22:28:07 +01:00
Klaus Weidenbach
daed7fbead
Bugfix und variable initialization.
...
Fixed a wrong perm_is_allowed() parameter, commented some other places
where we use variables that are not set and should not work.
2015-03-21 22:28:07 +01:00
Mario Vavti
5a1c388d4a
Merge branch 'master' of https://github.com/friendica/red
2015-03-21 15:17:59 +01:00
Mario Vavti
9980645ab8
fix acl for if we have an cid in /network and make $bang better visible
2015-03-21 13:37:55 +01:00
RedMatrix
590df06556
Merge pull request #933 from dawnbreak/docu
...
Extend Doxygen configuration a bit to display more.
2015-03-21 15:03:08 +11:00
friendica
85dd08427c
change permission roles for things like channel admin to make them more easily manually settable from the connections edit page.
2015-03-20 18:50:45 -07:00
Klaus Weidenbach
91f7da6f01
Extend Doxygen configuration a bit to display more.
...
Add view of \license information in Doxygen information and add an
overview page for \fixme which is used in source code.
We have Bug List, Fixme List, Todo List and Deprecated List. Do we have
some other tags we use that we could collect and display?
2015-03-21 01:56:20 +01:00
friendica
96afe7bf42
set to empty string so it doesn't get mis-handled as a null
2015-03-20 16:49:49 -07:00
friendica
07f8e7049a
Merge https://github.com/friendica/red into pending_merge
2015-03-20 16:47:38 -07:00
friendica
01716dea3d
config to hide version tag from siteinfo - on my site it's meaningless.
2015-03-20 16:46:07 -07:00
Mario Vavti
ead45292e1
some tabs title statuseditor restructuring
2015-03-21 00:06:18 +01:00
Mario Vavti
9a2ef38267
need the cloudpath before creating the object
2015-03-20 18:04:22 +01:00
Mario Vavti
264b43db05
some cleanup
2015-03-20 17:46:13 +01:00
Mario Vavti
6698d7b03a
possible improvement regarding deletion
2015-03-20 17:37:01 +01:00
Mario Vavti
fdac8373d8
remove unused vars
2015-03-20 14:10:22 +01:00
Mario Vavti
7b05c96dc5
remove more $vars from style.css
2015-03-20 13:12:55 +01:00
friendica
274a30f2db
call parse_url from rpost and add the result to the content body if invoked with a url argument
2015-03-19 16:41:41 -07:00
friendica
2010d6a332
Explicitly force link for 'All Collections' on the network page to gid=0 so it can be used with a default page over-ride for gid.
2015-03-19 16:22:08 -07:00
friendica
b6965ad01f
Merge https://github.com/friendica/red into pending_merge
2015-03-19 15:58:08 -07:00
friendica
b1fd6c53a5
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 15:56:30 -07:00
friendica
24ebaaf0f7
ratenotif: loop oddity
2015-03-19 15:24:09 -07:00
Mario Vavti
a185b555dc
there are no vars to replace in converse_center.css
2015-03-19 17:20:16 +01:00
Mario Vavti
b582357983
update schema doco a little. needs some more...
2015-03-19 17:06:02 +01:00
Mario Vavti
b3ff6da6bc
remove more unused $vars
2015-03-19 16:33:15 +01:00
Mario Vavti
d1dd883d88
remove more $vars from style.css
2015-03-19 16:17:01 +01:00
Mario Vavti
db355db9a6
remove $abook_changebg from style.css
2015-03-19 15:33:15 +01:00
Mario Vavti
ad9f5079cd
do not destroy page layout if feature_encrypt is not enabled
2015-03-19 12:40:04 +01:00
friendica
63683734a2
make the channel item query match recent changes to network item query (and some slightly older changes in display item query), and allow '@' in linkified urls.
2015-03-18 19:06:05 -07:00
friendica
5a7e35fbf8
Change wording on the photo location feature. When photos are merged with DAV storage we won't be stripping metadata by default.
2015-03-18 17:36:06 -07:00
friendica
3403c26ad5
Merge https://github.com/friendica/red into pending_merge
2015-03-18 12:28:18 -07:00
friendica
aa6549c239
we upped the php version requirement. So up yours.
2015-03-18 12:27:30 -07:00
Mario Vavti
463bd146dc
remove px from default value
2015-03-18 16:42:04 +01:00
Mario Vavti
096ab06dcb
just to be sure
2015-03-18 16:37:33 +01:00
Mario Vavti
d4de2dfe7a
move body-font-size setting backt to expert. most people probably use browser built in zoom capabilitie.
2015-03-18 15:47:20 +01:00
Mario Vavti
32c7d381b6
Merge branch 'master' of https://github.com/friendica/red
2015-03-18 14:42:25 +01:00
Mario Vavti
8cb31172a9
make every page regard max content width setting and move the setting out of experts mode
2015-03-18 14:41:54 +01:00
jeroenpraat
2a394b8abe
Update Dutch translations
2015-03-18 13:48:24 +01:00
friendica
7a9aca6ecb
fix the map embed issue by keeping the map visible but moving it far off the screen.
2015-03-17 18:45:56 -07:00
friendica
f5602f129e
Merge https://github.com/friendica/red into pending_merge
2015-03-17 15:45:41 -07:00
friendica
629f6bec74
ok it has to be owner.
2015-03-17 15:45:08 -07:00
Mario Vavti
9472d0a683
move bootbox out of bootstrap
2015-03-17 23:16:22 +01:00
Mario Vavti
7966c2db4c
update bootstrap-3.3.4 and bootbox-4.4.0
2015-03-17 23:07:08 +01:00
Mario Vavti
ccdb027677
Merge branch 'master' of https://github.com/friendica/red
2015-03-17 15:12:39 +01:00
Paolo T
Mario Vavti
friendica
Klaus Weidenbach
jeroenpraat