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

18732 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jan-Christoph Borchardt
218131d30d fix leading decimal Scrutinizer coding style issue 2014-06-05 10:52:06 +02:00
Thomas Müller
6fcd135d0e table files_trashsizes was still used in some locations -> removed 2014-06-05 10:44:32 +02:00
icewind1991
09cc7c2d44 Merge pull request #8862 from owncloud/share-overview-fixmimetype 
Fix mime type returning for shared with others files
 2014-06-05 10:29:03 +02:00
Vincent Petry
71b86136c2 Merge pull request #8878 from owncloud/update-checkmigrationforapps 
Simulate apps database schema update on upgrade
 2014-06-05 10:28:30 +02:00
Robin Appelman
3e73251750 Don't update the mtime if the storage mtime hasn't changed 2014-06-05 10:08:25 +02:00
Thomas Müller
ff3ded6cb2 Merge pull request #8852 from owncloud/kill-permissions-master 
Kill permissions table
 2014-06-05 10:05:05 +02:00
Morris Jobke
e186871996 fix unit test template 2014-06-05 09:46:19 +02:00
Thomas Müller
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
Jenkins for ownCloud
cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Morris Jobke
e3cbcadbd8 fix first failing test 2014-06-05 00:40:15 +02:00
Morris Jobke
39eeb7def9 Merge pull request #8882 from owncloud/remove-placeholdercall 
remove obsolete placeholder call, fix #8881
 2014-06-05 00:07:13 +02:00
Thomas Müller
c044ff99ce Merge pull request #8724 from owncloud/update-sabre-2.0 
Update SabreDAV to 1.8.10
 2014-06-04 23:05:34 +02:00
Thomas Müller
ec7225da66 remove file locking - code will continue to live in it's own app 2014-06-04 20:11:54 +02:00
Vincent Petry
95fda3c17c Do not load apps when upgrade is needed 
This prevents routes like "core/js/oc.js" to automatically load apps and
trigger their update prematurely.
 2014-06-04 18:52:52 +02:00
Morris Jobke
7a20d22daa Merge pull request #8824 from owncloud/mail_template_editing_in_webui 
minimal mail template editor for administrators
 2014-06-04 18:44:44 +02:00
Jan-Christoph Borchardt
e26936e94f remove obsolete placeholder call, fix #8881 2014-06-04 18:44:12 +02:00
Morris Jobke
210a1ef7e6 add to app navigation after enabling 2014-06-04 18:22:40 +02:00
Robin Appelman
9eb177e8bc Use the permissions exposed by ownCloud for webdav external storages 2014-06-04 18:19:52 +02:00
Thomas Müller
a2db53b928 Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size 
[versioning] let the file cache track the size of the versions
 2014-06-04 18:19:48 +02:00
Vincent Petry
d4ffafe467 Removed simulate db update flag and split into separate methods 2014-06-04 18:17:46 +02:00
Morris Jobke
e734caecba Merge pull request #8876 from owncloud/design-css-settings 
personal settings: unbold clients header and remove obsolete CSS
 2014-06-04 17:52:10 +02:00
Thomas Müller
48eee0b432 use the right interface \Sabre\DAVACL\PrincipalBackend\BackendInterface 2014-06-04 17:47:09 +02:00
Vincent Petry
5b97369b00 Simulate apps database schema update on upgrade 
When upgrade, also simulate the database schema update for apps before
doing the actual upgrade.
 2014-06-04 17:16:44 +02:00
Jan-Christoph Borchardt
71ba457372 personal settings: unbold clients header and remove obsolete CSS 2014-06-04 17:05:44 +02:00
Morris Jobke
ca43fba513 Merge pull request #8791 from owncloud/share-overview-sharewithstatus 
Update share action text to display owner/recipients
 2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt
c6196c022d Merge pull request #8875 from owncloud/app-css-relative 
explicit position:relative for app-content, fixes first run layout
 2014-06-04 16:51:43 +02:00
Jan-Christoph Borchardt
411e6525b1 remove obsolete position rule from files app 2014-06-04 16:50:55 +02:00
Jan-Christoph Borchardt
9c6f604321 explicit position:relative for app-content, fixes first run layout 2014-06-04 16:41:11 +02:00
Jan-Christoph Borchardt
44dca8b740 hover effect for app switcher label 2014-06-04 16:33:12 +02:00
Jan-Christoph Borchardt
bc47e56f9f fix related layout issues in user management 2014-06-04 16:24:39 +02:00
Vincent Petry
da889ff029 Added experimental switch to count external storage data in quota 
This includes all mountpoints except the Shared one in
the used space calculation.

Added unit tests for ext storage inclusion in quota calculation
 2014-06-04 16:08:59 +02:00
Jan-Christoph Borchardt
358a4ce753 add a bit of whitespace to the bottom of the app list 2014-06-04 15:57:23 +02:00
Jan-Christoph Borchardt
5a38560115 reduce opacity of app icon when loading 2014-06-04 15:54:23 +02:00
Jan-Christoph Borchardt
8f4221edde more CSS rearranging, removing duplicate code 2014-06-04 15:49:04 +02:00
Jan-Christoph Borchardt
f1ce58de3e rearrange CSS, remove duplicate code 2014-06-04 15:46:36 +02:00
Jan-Christoph Borchardt
d831afc792 move 'add apps' entry into normal navigation instead of a new line 2014-06-04 15:27:46 +02:00
Jan-Christoph Borchardt
26bf64631d better loading feedback for app start, move from JS to CSS 2014-06-04 15:07:15 +02:00
Thomas Müller
fc1d6f4c3c fixes during test 2014-06-04 15:01:36 +02:00
Jan-Christoph Borchardt
96cfe97dae show 'Apps' as fallback label for app switcher if no app title is present (for example in Settings) 2014-06-04 14:38:25 +02:00
Jan-Christoph Borchardt
e291a04dee show loading feedback 2014-06-04 14:38:25 +02:00