400a2cd912
Merge branch 'master' into trinidad
2015-01-06 14:51:13 -08:00
4b9ed48a54
don't let dns_get_record() "write to screen" if it errors.
2015-01-06 14:50:29 -08:00
aaceb71e86
Merge branch 'master' into trinidad
2015-01-06 13:45:55 -08:00
2417125c89
Merge pull request #826 from pafcu/cache_autocomplete
...
Cache autocomplete results locally (the one in the editor)
2015-01-07 08:45:47 +11:00
c9839d38a5
Merge branch 'master' into trinidad
2015-01-06 13:43:19 -08:00
1cfff44535
lines reversed in handle_tag()
2015-01-06 13:42:55 -08:00
3e41b8137c
Cache autocomplete results locally (the one in the editor)
2015-01-06 21:01:30 +01:00
c05586fbe7
begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
2015-01-06 11:55:42 -08:00
7ee5567421
Merge branch 'master' into trinidad
2015-01-06 11:40:31 -08:00
8c5e5c3449
Merge pull request #825 from einervonvielen/dev_beginning_fix
...
Corrected errors in chapter 'Contribute your changes via github'
2015-01-07 06:40:20 +11:00
911d7105a0
Merge branch 'pafcu-mainjsoptimize'
2015-01-06 11:38:21 -08:00
11ec8d865c
Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into pafcu-mainjsoptimize
...
Conflicts:
view/js/main.js
2015-01-06 11:37:48 -08:00
e20d82ab0b
Merge branch 'master' into trinidad
2015-01-06 11:26:54 -08:00
b8d3936e47
Merge https://github.com/friendica/red into pending_merge
2015-01-06 11:26:53 -08:00
01e65ffbb4
revup
2015-01-06 11:26:35 -08:00
1064be3a76
add some style to divgrowmore
2015-01-06 20:06:41 +01:00
88d26f1f87
Corrected errors in chapter 'Contribute your changes via github'
...
- changed commit statement
- changed push statement (it pointed to the orign)
2015-01-06 19:07:59 +01:00
94dd994abc
Merge pull request #823 from einervonvielen/dev_beginning
...
Step-by-step manual to debug the red matrix (php) and to contribute code
2015-01-06 17:44:58 +01:00
2f0d196f28
spelling
2015-01-06 17:32:57 +01:00
ba428533bb
added modification of branch
2015-01-06 17:27:52 +01:00
a5766534fe
Mainly it shows how to debug the red matrix (php) in a virtual machine and contribute changes via git.
...
It will guide to the following steps:
- Install a Virtual Machine
- Install Apache Web Server
- Install PHP, MySQL, phpMyAdmin
- Fork the project on github to be able contribute
- Install the RED Matrix
- Debug the server via eclipse
- Contribute your changes via github
2015-01-06 16:22:30 +01:00
b12393ea12
Mainly it shows how to debug the red matrix (php) in a virtual machine and contribute changes via git.
...
It will guide to the following steps:
- Install a Virtual Machine
- Install Apache Web Server
- Install PHP, MySQL, phpMyAdmin
- Fork the project on github to be able contribute
- Install the RED Matrix
- Debug the server via eclipse
- Contribute your changes via github
2015-01-06 16:14:04 +01:00
5c8aca9a61
Merge pull request #822 from pafcu/master
...
Add title to bb_observer tags to further clarify a bit what's going on
2015-01-06 17:06:44 +02:00
29e0bfee2f
Fix bug in readmore.js
2015-01-06 15:54:58 +01:00
fac6963444
Add title to bb_observer tags to further clarify a bit what's going on
2015-01-06 14:00:31 +01:00
c3433bdf95
Don't update fuzzy time for items in a collapsed thread to increase performance.
2015-01-06 12:01:50 +01:00
ae821efbf1
Update jquery.timeago.js to add support for dispose action
2015-01-06 11:43:59 +01:00
859b672e37
Merge branch 'master' into trinidad
2015-01-05 21:00:32 -08:00
43f43d78cf
regression: need float clear on manage page so footer doesn't end up floated,
...
add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this.
2015-01-05 20:57:30 -08:00
39459c2d65
undo these bits of trinidad - we're going to do things differently
2015-01-05 18:22:15 -08:00
2dca165f9b
Merge branch 'master' into trinidad
2015-01-05 16:14:56 -08:00
3185bfe3ca
detect https coming through reverse proxy or load balancer using x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled
2015-01-05 16:12:55 -08:00
8a3ef177ce
Merge branch 'master' into trinidad
2015-01-05 14:41:08 -08:00
3df3ab5630
Merge https://github.com/friendica/red into pending_merge
2015-01-05 14:41:04 -08:00
05a237b808
revup
2015-01-05 14:40:52 -08:00
c45456fa33
Merge pull request #820 from pafcu/nomigrate
...
Steps towards not needing jquery-migrate
2015-01-06 09:40:26 +11:00
5ce5de7305
Remove unneeded divgrow library
2015-01-05 22:11:24 +01:00
1ac9a4976f
Unbreak readmore
2015-01-05 22:09:05 +01:00
7c3193e26e
Make slider less ugly
2015-01-05 22:02:48 +01:00
cf840bee11
Remove reference to non-existing colorbox.css
2015-01-05 21:26:20 +01:00
6d0832e693
Fix error with undefined profile_uid
2015-01-05 20:29:20 +01:00
749aef7172
Remove some unneeded libraries
2015-01-05 20:27:01 +01:00
b320b8cbf3
Replace fancybox with colorbox
2015-01-05 19:49:20 +01:00
c9f26c8b7b
Update jGrowl
2015-01-05 18:36:24 +01:00
128b0008ee
Replace jslider with jRange
2015-01-05 18:30:12 +01:00
7791d28a5d
Replace divgrow with more modern readmore.js
2015-01-05 17:10:08 +01:00
ed19984534
Merge branch 'master' into trinidad
2015-01-04 20:48:17 -08:00
074be42e23
regression: autocomplete hovertip with url/address missing - useful for identifying connections based on their site if they have different channels (not clones) on different sites with all other identifying info the same.
2015-01-04 20:45:16 -08:00
0c0a004e45
Merge branch 'master' into trinidad
2015-01-04 19:57:15 -08:00
fc72762f52
Merge pull request #819 from pafcu/acl
...
Fix initEditor on non-wall pages
2015-01-05 01:31:52 +02:00
friendica
Stefan Parviainen
marijus
Einer von Vielen
mrjive
pafcu