wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
18572 commits 157 branches 562 tags 714 MiB
Commit graph

18572 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bjoern Schiessle
329bfd81c3 remove encryption keys if user unshares a file 2014-06-06 09:55:59 +02:00
Bjoern Schiessle
1b0b977678 remove share mount 2014-06-06 09:55:59 +02:00
Robin Appelman
dea5219244 Fix folder name for storage root 2014-06-06 09:55:59 +02:00
Bjoern Schiessle
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
Robin Appelman
a66c2e6a47 Fix the removeMount for personal mounts 2014-06-06 09:55:59 +02:00
Robin Appelman
4fbc991ea2 Add the removing logic for mounts 2014-06-06 09:55:59 +02:00
Robin Appelman
14ce44acc8 Move shared mount moving from the storage to the mount 2014-06-06 09:55:59 +02:00
Robin Appelman
cabe2873c4 Make personal external mount points (re)movable from the files app 2014-06-06 09:55:59 +02:00
Robin Appelman
8abe1c3f1a Don't do rename hooks for cache when moving the mountpoint 2014-06-06 09:55:58 +02:00
Robin Appelman
60a659c87e Add a system for (re)movable mount points 2014-06-06 09:55:58 +02:00
Thomas Müller
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
Thomas Müller
d359765bdc Update PHPDoc 2014-06-06 09:44:34 +02:00
Jan-Christoph Borchardt
1745fe1664 Merge pull request #8911 from owncloud/common-lang 
Add Turkish to common languages
 2014-06-06 09:38:10 +02:00
Jenkins for ownCloud
ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Volkan Gezer
11a857f653 Add Turkish to common languages 2014-06-05 22:32:35 +02:00
Thomas Müller
70e0ae0637 Merge pull request #8483 from owncloud/encryption_use_oc_preferences 
[encryption] use oc preferences
 2014-06-05 18:54:25 +02:00
Vincent Petry
1c59808517 Merge pull request #8865 from owncloud/improve_share_settings 
Improve share settings
 2014-06-05 17:23:42 +02:00
Thomas Müller
e9011a8c55 adding unit tests for encryption data migration 2014-06-05 16:54:04 +02:00
Bjoern Schiessle
eb29b2984c use oc_preferences instead of oc_encryption to store encyption settings 2014-06-05 16:54:04 +02:00
Bjoern Schiessle
2d83424a29 allow to set pre-condition for setValue 2014-06-05 16:54:03 +02:00
Thomas Müller
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
Thomas Müller
9e84a0a1af Merge pull request #8902 from owncloud/fix_ldap_typo_2 
fix typo in var name
 2014-06-05 16:49:22 +02:00
Arthur Schiwon
928945ec7e fix typo in var name 2014-06-05 16:16:08 +02:00
jbtbnl
bb60e850dd Merge pull request #8891 from owncloud/design-emptycontent 
fix size and unbold empty content message
 2014-06-05 16:04:04 +02:00
Robin Appelman
00539cf8f9 Verify that we have a valid storage in View->getPath 2014-06-05 15:50:19 +02:00
Bjoern Schiessle
6578f00b4b unify share settings 2014-06-05 15:49:34 +02:00
Bjoern Schiessle
cf9099c788 This settings doesn't belong together 
Revert "make reshare settings foldable"

This reverts commit c01f196f72.

Conflicts:
	settings/templates/admin.php
 2014-06-05 15:44:56 +02:00
Bjoern Schiessle
c991e148a6 improve share settings working 2014-06-05 15:44:55 +02:00
Jörn Friedrich Dreyer
0ce1f34f8a Merge pull request #8897 from owncloud/fix-multiselect 
fix files multiselect bar now that the app list is gone
 2014-06-05 15:32:31 +02:00
Thomas Müller
3dbfd1fe46 Merge pull request #8529 from owncloud/remove-legacy-routing 
Remove legacy routing code
 2014-06-05 15:22:46 +02:00
Joas Schilling
d493c0c9ac Sort the result before comparing 2014-06-05 15:21:53 +02:00
Jan-Christoph Borchardt
dca5a03f8b fix files multiselect bar now that the app list is gone 2014-06-05 13:23:08 +02:00
Thomas Müller
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
Vincent Petry
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
Thomas Müller
e34b51124b Merge pull request #8894 from owncloud/public-share-js-overwrite 
Dont overwrite OCA.Sharing
 2014-06-05 13:04:30 +02:00
Thomas Müller
f955209a5a Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master 
table files_trashsizes was still used in some locations -> removed
 2014-06-05 13:00:50 +02:00
Robin Appelman
690e0b5070 Dont overwrite OCA.Sharing 2014-06-05 12:52:08 +02:00
Joas Schilling
4b18967129 Hack around oracle for CLOB fields 2014-06-05 12:19:48 +02:00
Joas Schilling
879237f32a Add method to get users by their preference 2014-06-05 11:50:43 +02:00
Lukas Reschke
7c4abce373 Move authentication to it's own call 2014-06-05 11:45:45 +02:00
Lukas Reschke
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
Thomas Müller
d0eb8f8668 Merge pull request #8880 from owncloud/webdav-read-permissions 
Use the permissions exposed by ownCloud for webdav external storages
 2014-06-05 11:38:02 +02:00
Jan-Christoph Borchardt
fdfba14405 Merge pull request #8883 from owncloud/files-slide-toggle 
use slide toggle for files app
 2014-06-05 11:33:56 +02:00
Robin Appelman
9dab6ec2ec Fix uit tests 2014-06-05 11:31:55 +02:00
Jan-Christoph Borchardt
0ac1086ef6 fix size and unbold empty content message 2014-06-05 11:29:56 +02:00
Bernhard Posselt
844c6c3328 use slide toggle for files app 2014-06-05 11:26:24 +02:00
icewind1991
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
Vincent Petry
e0c4e960d9 Merge pull request #8861 from owncloud/share-overview-linklist 
Added Shared with link sidebar section in files app
 2014-06-05 10:59:54 +02:00
Jörn Friedrich Dreyer
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
Thomas Müller
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