1b02991a1d
Fixes based on suggestions
...
I use the term socket for any extension, either unix socket, or internet socket (port).
I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.
By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.
I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks
2014-06-11 21:47:45 -07:00
4e4c2b04c8
Fixed array_combine for PHP 5.3
2014-06-11 19:13:49 +02:00
75a53b3c49
Merge pull request #8901 from owncloud/permissions-update-cache
...
Save the permissions in the filecache if it's not saved yet
2014-06-11 18:28:55 +02:00
65b3d293ce
Added ORDER BY to enforce share entry order
...
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.
This fix adds an ORDER BY clause to force the order by id.
2014-06-11 14:28:30 +02:00
491c96eaa9
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
...
Fix failing tests on master
2014-06-11 10:05:38 +02:00
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
93169eca1e
also handle lowercase headers
2014-06-11 01:20:09 +02:00
0252d39bb6
fix indention
2014-06-11 00:57:00 +02:00
1002281dae
handle http accept headers more gracefully
2014-06-11 00:54:25 +02:00
7396e5f455
movie previews: use file directly when it's stored locally and encryption is not enabled, fixes #7756
2014-06-10 22:08:27 +02:00
5e9fa64819
don't show update button when appstore is disabled or no writable dir exists
2014-06-10 18:39:34 +02:00
e047e28ac5
make text preview backend use imagettftext, fixes #8087
2014-06-10 17:29:40 +02:00
6b1d8a56bb
remove unused argument
2014-06-10 15:42:37 +02:00
054083b9cd
add some comments
2014-06-10 15:37:43 +02:00
21cfd1014a
Repair broken parent link in the scanner
2014-06-10 15:26:18 +02:00
9dc0befcca
call self::getNumericStorageId() to get the numeric ID
2014-06-10 14:48:19 +02:00
602404c631
fix php doc block
2014-06-10 13:58:41 +02:00
6bf06890e7
always return a bool in OC_App::updateApp
2014-06-10 13:56:05 +02:00
5d4f3baf56
fix php doc block
2014-06-10 13:51:20 +02:00
1ab9bdcaa0
remove unnecessary @return
2014-06-10 13:01:10 +02:00
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
41d2354191
Save the permissions in the filecache if it's not saved yet
2014-06-09 12:34:35 +02:00
63c5c7bd21
set logger before registrate to an error handler
2014-06-09 10:02:23 +02:00
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
e769ef9bbb
Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix
...
Added hacky fix for long path cleanup routine
2014-06-08 20:46:00 +02:00
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
3da47db33c
Merge pull request #8927 from owncloud/expire_only_link_shares
...
only expire link shares
2014-06-06 19:24:15 +02:00
647dcce514
Merge pull request #8253 from owncloud/pk-on-all-tables-master
...
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
c053f27381
Merge pull request #8921 from owncloud/fix-remove-storage-master
...
No need to create a storage within remove
2014-06-06 16:16:44 +02:00
f15d7dfec0
only expire link shares
2014-06-06 15:47:37 +02:00
fe8bae31dc
adding PK to table encryption
...
adding auto increment/PK to table files_trash
adding PK to table ldap_user_mapping and ldap_group_members
adding PK to table ldap_group_mapping
truncate permissions table to allow smooth creation of primary key
adding unit test for creating an auto increment column on a table which already contains data
remove unneeded table files_trashsizes
fix unit test
no need to truncate *PREFIX*permissions
On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually
2014-06-06 13:33:56 +02:00
5cebb6fb9b
Merge pull request #4553 from owncloud/update_search_classes
...
Update search classes
2014-06-06 13:24:16 +02:00
a59b5249d3
add more and fix office mimetypes, migrate wrong mimetypes
2014-06-06 12:00:25 +02:00
c47d4ebbac
Merge pull request #8666 from owncloud/mount-remove
...
Support for (re)moving mountpoints
2014-06-06 11:57:43 +02:00
0661d737e6
Merge pull request #8900 from guruz/webdav_permission_moveable_renameable
...
WebDAV Permissions: Distinguish between renameing and moving
2014-06-06 11:51:39 +02:00
ff12969276
Merge pull request #8905 from owncloud/update-cli-skipcheckmigrate
...
Added CLI arguments for upgrade simulation steps
2014-06-06 11:42:14 +02:00
26993f2167
No need to create a storage within remove
2014-06-06 11:39:35 +02:00
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
56470fa9b3
fix namespace for legacy search classes
2014-06-06 11:01:35 +02:00
6e2358c3a6
Added hacky fix for long path cleanup routine
2014-06-06 10:41:49 +02:00
3a7b30795c
Merge pull request #8783 from owncloud/remove-serializers
...
Remove controller serializers
2014-06-06 10:33:16 +02:00
5e27ac3e0d
Added CLI arguments for upgrade simulation steps
...
Added "dry run" argument to only run the update simulation.
Added argument to disable migration (useful for bigger setups where
table duplication would take too much space)
2014-06-06 10:11:14 +02:00
ff651a3e0d
Merge pull request #8909 from owncloud/fix-temporary-storage-rmdirr-master
...
use system function to recursive remove the directory used by temporary ...
2014-06-06 10:02:23 +02:00
46f70aabfd
Dont connect hooks twice
2014-06-06 09:56:02 +02:00
3459f99dd6
make sure that we only delete shares for the current user
2014-06-06 09:56:02 +02:00
eec1c4398a
only unshare user share if it was shared with the current user
2014-06-06 09:56:02 +02:00
5bbfdc35d7
make sure that we remove all shares refering to the same parent
2014-06-06 09:56:02 +02:00
86d7371d0c
fix unshareFromSelf()
2014-06-06 09:56:02 +02:00
e362373a30
Movable storage root can always be moved and deleted
2014-06-06 09:56:01 +02:00
a432459685
use triple equals
2014-06-06 09:56:01 +02:00
42a362f249
Fix phpdoc and comments
2014-06-06 09:56:01 +02:00
b0a74edbb2
allow moving files to the root
2014-06-06 09:56:00 +02:00
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
dea5219244
Fix folder name for storage root
2014-06-06 09:55:59 +02:00
bf5e9357fc
don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it
2014-06-06 09:55:59 +02:00
4fbc991ea2
Add the removing logic for mounts
2014-06-06 09:55:59 +02:00
8abe1c3f1a
Don't do rename hooks for cache when moving the mountpoint
2014-06-06 09:55:58 +02:00
60a659c87e
Add a system for (re)movable mount points
2014-06-06 09:55:58 +02:00
79b65269c9
Merge pull request #8877 from owncloud/getpath-storage-check
...
Verify that we have a valid storage in View->getPath
2014-06-06 09:44:57 +02:00
d359765bdc
Update PHPDoc
2014-06-06 09:44:34 +02:00
a110973b3a
some additional type checks
2014-06-06 09:41:53 +02:00
498aa66648
add additional type check
2014-06-06 09:33:34 +02:00
ad4ec414c9
use system function to recursive remove the directory used by temporary storage
2014-06-06 09:29:31 +02:00
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
aaf0d13171
make search non-static, add ISearch to server container, make legacy a static wrapper for it, move provider and result to public api
2014-06-06 01:17:02 +02:00
0fe8f77c17
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
settings/templates/apps.php
2014-06-05 22:54:27 +02:00
5034bd1b12
minor phpdoc cleanup and imports
2014-06-05 19:49:21 +02:00
7a224f5762
Move new search results to 'lib/private/search'
2014-06-05 19:23:44 +02:00
8a223eb62d
Move legacy search to 'lib/private/legacy'
...
This fixes errors where apps would try to start providers using
OC_Search and would fail. Also, made OC_Search simply inherit from
\OC\Search.
2014-06-05 19:23:44 +02:00
794a133f9a
Re-add type to legacy OC_Search_Result class
2014-06-05 19:23:44 +02:00
70be98f6d0
Add audio and image result types
2014-06-05 19:22:22 +02:00
c46d514733
Add audio and image result types
2014-06-05 19:22:22 +02:00
afd24385a8
fix formatting
2014-06-05 19:22:22 +02:00
a6583d3976
Add legacy adapters for file search
2014-06-05 19:21:47 +02:00
ac72828eae
Move to new namespace convention and add new result sub-classing
2014-06-05 19:21:47 +02:00
70e0ae0637
Merge pull request #8483 from owncloud/encryption_use_oc_preferences
...
[encryption] use oc preferences
2014-06-05 18:54:25 +02:00
587a8df566
remove controller serializers
2014-06-05 18:00:36 +02:00
1c59808517
Merge pull request #8865 from owncloud/improve_share_settings
...
Improve share settings
2014-06-05 17:23:42 +02:00
2d83424a29
allow to set pre-condition for setValue
2014-06-05 16:54:03 +02:00
4b650a20a4
Merge pull request #8893 from owncloud/feature/get-users-by-preference
...
Add method to get users by their preference
2014-06-05 16:52:00 +02:00
fad3bd7fc0
reenable checkCode()
2014-06-05 16:32:46 +02:00
00539cf8f9
Verify that we have a valid storage in View->getPath
2014-06-05 15:50:19 +02:00
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
3dbfd1fe46
Merge pull request #8529 from owncloud/remove-legacy-routing
...
Remove legacy routing code
2014-06-05 15:22:46 +02:00
e6665a0542
WebDAV Permissions: Distinguish between renameing and moving
2014-06-05 14:39:06 +02:00
e1beb8c6c3
Merge pull request #8889 from owncloud/mtime-reuse
...
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 13:18:18 +02:00
bbdcbb9911
Merge pull request #8866 from owncloud/flock-quotafix
...
Fixed quota wrapper to return the value from flock()
2014-06-05 13:11:45 +02:00
4b18967129
Hack around oracle for CLOB fields
2014-06-05 12:19:48 +02:00
9e56acbdc9
add snap.js script
2014-06-05 11:52:17 +02:00
879237f32a
Add method to get users by their preference
2014-06-05 11:50:43 +02:00
7c4abce373
Move authentication to it's own call
2014-06-05 11:45:45 +02:00
ac7fb1b23e
Remove legacy routing code
...
The getfile routing code was absolutely legacy and not needed anymore. Additionally \OC::$REQUESTEDAPP was never set to the actually accessed application.
This commit removes the legacy routing code and ensures that $REQUESTEDAPP is always set so that other applications (e.g. the firewall or a two-factor authentication) can intercept the currently accessed app.
Testplan:
[x] Installation works
[x] Login with DB works
[x] Logout works
[x] Login with alternate backend works (tested with user_webdavauth)
[x] Other apps are accessible
[x] Redirect on login works (e.g. index.php?redirect_url=%2Fcore%2Findex.php%2Fsettings%2Fapps%3Finstalled)
[x] Personal settings are accessible
[x] Admin settings are accessible
[x] Sharing files works
[x] DAV works
[x] OC::$REQUESTEDAPP contains the requested application and can be intercepted by other applications
2014-06-05 11:45:45 +02:00
bd373d9621
Merge pull request #7878 from owncloud/quota-extstorageswitch
...
Added switch to count external storage data in quota
2014-06-05 11:23:32 +02:00
f1bf06f8cf
Merge pull request #8884 from owncloud/move-flock-to-app
...
remove file locking - code will continue to live in it's own app
2014-06-05 10:54:24 +02:00
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
71b86136c2
Merge pull request #8878 from owncloud/update-checkmigrationforapps
...
Simulate apps database schema update on upgrade
2014-06-05 10:28:30 +02:00
3e73251750
Don't update the mtime if the storage mtime hasn't changed
2014-06-05 10:08:25 +02:00
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
josh4trunks
Vincent Petry
Jenkins for ownCloud
Bernhard Posselt
Georg Ehrke
Robin Appelman
Bjoern Schiessle
Morris Jobke
Thomas Müller
Jörn Friedrich Dreyer
icewind1991
Andrew Brown
Markus Goetz
Joas Schilling
Jan-Christoph Borchardt
Lukas Reschke