friendica
0bfbe6d61d
sql typo
2015-01-27 19:58:43 -08:00
friendica
ac594183c6
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
...
Conflicts:
include/attach.php
include/onedirsync.php
include/zot.php
mod/locs.php
2015-01-26 18:27:03 -08:00
friendica
e6bfe3f2c1
onedirsync merge
2015-01-26 18:09:09 -08:00
friendica
9f5bfca28d
Merge https://github.com/friendica/red into pending_merge
2015-01-26 17:10:05 -08:00
friendica
d73972e8e2
provide a json feed of search results
2015-01-26 17:09:33 -08:00
Habeas Codice
aa24d6c8e5
Add pg support channel to external resources
2015-01-25 20:43:32 -08:00
RedMatrix
20d7ed3100
Merge pull request #878 from habeascodice/master
...
ping @mike
2015-01-26 11:31:10 +11:00
friendica
b428fdf66e
abstract poco into a single function in socgraph so we can provide different wrappers for it providing slightly different functionality.
2015-01-25 16:27:09 -08:00
friendica
505d530d28
we also don't need a profile selector when editing our default permissions.
2015-01-25 14:32:00 -08:00
friendica
03412e8a58
don't hide the scary stuff when editing self permissions.
2015-01-25 14:28:48 -08:00
friendica
c1290861db
roadmap update
2015-01-25 14:24:07 -08:00
friendica
0125e9d288
Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs.
2015-01-25 14:06:57 -08:00
friendica
f78a061406
turn "large photo thumbnails" into a feature.
2015-01-25 13:49:10 -08:00
friendica
4ca2ec7638
rework the new connection stuff so we don't need a "permissions have been changed but not saved" message.
2015-01-25 13:30:40 -08:00
RedMatrix
642c933d98
Merge pull request #879 from anaqreon/patch-1
...
misspelling
2015-01-26 07:51:20 +11:00
anaqreon
1cbfe5adf1
misspelling
2015-01-25 15:49:07 -05:00
friendica
4776f62be9
recognise opus as an audio file
2015-01-25 12:41:08 -08:00
friendica
b3370243e8
move connection approval checkbox to top of page (above the sliders) - instead of being in between rating and rating text.
2015-01-25 12:35:57 -08:00
Habeas Codice
dc259ba027
typo
2015-01-25 04:13:14 -08:00
Habeas Codice
0ca71a6b5e
update schema
2015-01-25 04:05:28 -08:00
Habeas Codice
200d973581
suppress notices that might be confusing
2015-01-25 04:04:53 -08:00
friendica
30815e0c57
don't set a rating of 1 on old sites that report poco rating as an array. Just set it to 0. It will be fixed whenever they upgrade.
2015-01-25 00:38:38 -08:00
Habeas Codice
f9aaa03036
Merge branch 'master' of https://github.com/friendica/red
2015-01-24 22:14:35 -08:00
RedMatrix
dfc6126a65
Merge pull request #877 from solstag/master
...
Call sslify with an extra path element so files keep their names
2015-01-25 17:13:11 +11:00
RedMatrix
776557cb88
Merge pull request #876 from cvogeley/master
...
Check allowed emails, also add blacklisting for
2015-01-25 17:12:43 +11:00
Habeas Codice
1d6aead325
remove superfluous group by
...
this gets called from a zot post_post dealing with a specific messageid and hubloc_hash combination. grouping by site
doesn't make sense here and it gets grouped when pulled back out elsewhere anyway
2015-01-24 22:07:53 -08:00
Habeas Codice
af7fa99e2e
Merge branch 'master' of https://github.com/friendica/red
2015-01-24 21:18:27 -08:00
Habeas Codice
1d80bcf2e7
standardize sql
2015-01-24 21:16:43 -08:00
Alexandre Hannud Abdo
2e783dbe79
Call sslify with an extra path element so files keep their names
...
The main motivation for this is when saving images one doesn't
need to inspect and manually input the file's actual name.
There might be other benefits, perhaps in automated downloads.
2015-01-25 02:08:59 -02:00
Christian Vogeley
ba10833bc5
Check allowed emails, also add blacklisting for
...
not allowed emails:
config:'system','not_allowed_email'
2015-01-25 04:16:28 +01:00
marijus
63f1ae5e20
optimize check query
2015-01-24 14:35:21 +01:00
marijus
ed09513bb2
Merge branch 'master' of https://github.com/friendica/red
2015-01-24 12:23:26 +01:00
marijus
e4e990df06
the old item must be removed before the new is created
2015-01-24 12:22:04 +01:00
Habeas Codice
146efbc18e
unmatched parens
2015-01-23 22:34:45 -08:00
friendica
34b5072ccf
Merge https://github.com/friendica/red into pending_merge
2015-01-23 21:49:48 -08:00
friendica
befe77a93f
onedirsync issue reported by habeas codice
2015-01-23 21:48:34 -08:00
Habeas Codice
0405f2bcb9
Merge branch 'master' of https://github.com/friendica/red
2015-01-23 17:26:37 -08:00
Habeas Codice
891d231bbe
rand() fixes
2015-01-23 17:25:05 -08:00
RedMatrix
be9fc16bd5
Merge pull request #875 from zzottel/master
...
add db update 1131/1132 to database schemas
2015-01-24 12:23:27 +11:00
marijus
4379354021
disable notices
2015-01-24 01:15:54 +01:00
marijus
0cbe64c360
some more kiss
2015-01-24 01:13:02 +01:00
zottel
eb4e6ab073
add db update 1131/1132 to database schemas
2015-01-23 23:20:30 +01:00
marijus
ea209a84ab
typo
2015-01-23 15:06:30 +01:00
marijus
b4f1cc5044
we get the object info before it is deleted now
2015-01-23 15:03:19 +01:00
marijus
884d542d4b
Merge branch 'master' of https://github.com/friendica/red
2015-01-23 14:51:15 +01:00
marijus
8789c96e78
some code restructure
2015-01-23 14:50:39 +01:00
friendica
7cd4374e3d
Merge https://github.com/friendica/red into pending_merge
2015-01-23 03:27:14 -08:00
friendica
c49c96962f
provide pref to set default photo resolution for posts to something other than 2. The only acceptable option is 1. (640)
2015-01-23 03:25:40 -08:00
friendica
0cdcc4bc50
doc updates
2015-01-23 03:25:17 -08:00
friendica
4c2a1e572a
start on item_restrict conversion
2015-01-22 21:04:54 -08:00