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

27056 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
97b5fe0b1e switch to async item loading, take care stuff is updated subsequently 2015-09-16 07:23:25 +02:00
Arthur Schiwon
e6edc3e05d make loadItems work async if a callback is provided 
not beautiful, but good enough. share.js will not be around too much longer.
 2015-09-16 07:23:25 +02:00
Arthur Schiwon
7971bc1ac0 model now extends Backbone's model and isadjusted 2015-09-16 07:23:25 +02:00
Arthur Schiwon
1651b8212c started to port the Model to Backbone`s 2015-09-16 07:23:25 +02:00
Arthur Schiwon
ea6e380efe remove possibly unreliable code and fix JSdoc 2015-09-16 07:23:25 +02:00
Arthur Schiwon
e7b5921206 share dialog view takes advantage of OC.Backbone.View 2015-09-16 07:23:25 +02:00
Arthur Schiwon
edd163a611 refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability 2015-09-16 07:23:25 +02:00
Joas Schilling
59967599ac Fix the parameter order in the translation 2015-09-16 06:47:40 +02:00
Robin McCorkell
7fc545470c Make AmazonS3 path style actually work 2015-09-16 02:02:59 +01:00
Robin McCorkell
17d1358aee AmazonS3 Ceph tests 2015-09-16 01:56:49 +01:00
Thomas Müller
2fc19635f6 Merge pull request #19014 from owncloud/dont-add-requestheaders-for-cross-domain-requests 
Add security hardenings to $.ajax()
 2015-09-16 00:16:31 +02:00
Thomas Müller
d1f7087b6c Merge pull request #18979 from owncloud/sidebare-preview-fixes 
Sidebare preview fixes
 2015-09-16 00:12:25 +02:00
Thomas Müller
f6f7d8cf94 Merge pull request #18938 from owncloud/occ_decrypt_all2 
occ script to disable encryption and to decrypt all files again
 2015-09-16 00:11:41 +02:00
Thomas Müller
ac1239220d Merge pull request #19052 from owncloud/revert-14856-remote_avatars 
Revert "Allow Remote avatars"
 2015-09-16 00:10:00 +02:00
Bjoern Schiessle
9bd4f2d41e occ script to disable encryption and to decrypt all files again 2015-09-15 22:39:44 +02:00
Robin McCorkell
0667c4363d Merge branch 'master' into smb-workgroup 2015-09-15 19:36:43 +01:00
Victor Dubiniuk
1f7ac2c309 Postrebase cleanup 2015-09-15 21:12:49 +03:00
Victor Dubiniuk
0cefbd76b9 Add expiration for versions older than max 2015-09-15 21:12:39 +03:00
Lukas Reschke
230029e509 Merge pull request #18368 from owncloud/version-retention 
Add versions obligation
 2015-09-15 19:32:07 +02:00
Lukas Reschke
82c2e0df7c Merge branch 'master' into version-retention 2015-09-15 19:29:06 +02:00
Jan-Christoph Borchardt
1d56d74c3f fix height of 'All files' entry in sidebar 2015-09-15 19:25:49 +02:00
Carla Schroder
11555a9c06 correction to logging levels 2015-09-15 09:17:59 -07:00
Jan-Christoph Borchardt
00d756b4d1 adjust multiselect bar to controls bar, fix #18989 2015-09-15 18:11:44 +02:00
Robin Appelman
9883d5b85d Merge pull request #18915 from owncloud/node-getfoldercontents-use-view-logic 
Use the view logic for getFolderContent for the node api
 2015-09-15 18:04:01 +02:00
Vincent Petry
7ab57f7f27 Add details icon for details menu item 2015-09-15 17:52:01 +02:00
Joas Schilling
fe8ef0dd36 Add reshare activities for the parent sharee and the original file owner 2015-09-15 17:36:56 +02:00
Robin Appelman
e545c2eec5 Merge pull request #17811 from owncloud/dav-lock-wide 
Wrap the entire dav PUT in a read lock
 2015-09-15 17:22:00 +02:00
Jan-Christoph Borchardt
accebae356 fix filename display in sidebar, fix #18981 2015-09-15 17:03:46 +02:00
Thomas Müller
ae9ea244f2 Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all 
Function does return void
 2015-09-15 17:03:34 +02:00
Thomas Müller
a446b43bcc Revert "Allow Remote avatars" 2015-09-15 16:52:12 +02:00
Jan-Christoph Borchardt
cb5ebef5df add details icon 2015-09-15 16:14:31 +02:00
Victor Dubiniuk
cb529acc5c Follow PSR 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
d57f3bf9cc Update options description 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3dc5b0317 Add method docblock 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
f46b434a12 Namespacing, reusing 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3e055549e Improvements 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
b95d1e6683 Add quota status to expiration check 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
7ef937d8ad Add versions obligation 2015-09-15 17:08:54 +03:00
Joas Schilling
754850f473 Fix status code 2015-09-15 15:51:54 +02:00
Robin Appelman
8767c2b3be fix small mimetype icons 2015-09-15 15:40:42 +02:00
Roeland Jago Douma
91dfcab055 Expose federated sharing capabilities to authenticated users 2015-09-15 15:10:13 +02:00
Joas Schilling
aa8b1b2894 Throw an error when the page count or perPage setting is invalid 2015-09-15 15:04:04 +02:00
Frank Karlitschek
650e600b94 Merge pull request #18273 from owncloud/files-sidebar-toggle 
Keep right sidebar open, add Details action
 2015-09-15 14:45:34 +02:00
Robin Appelman
72cfeaf157 recognize eps, psd and illustrator as image 2015-09-15 14:32:07 +02:00
Robin Appelman
98966329bf crop to the center for landscape images 2015-09-15 14:32:07 +02:00
Robin Appelman
a734606649 Various thumbnail fixes 
- Show square images as portrait
- Set max height based on sidebar width
- cleanup
 2015-09-15 14:32:07 +02:00
Robin Appelman
19e1d35373 Fix path for fileinfomodel in subdirectories 2015-09-15 14:29:37 +02:00
Robin Appelman
1c792b9f43 normal margins for portrait previews 2015-09-15 14:29:37 +02:00
Thomas Müller
decdaf0018 Merge pull request #19024 from owncloud/remove-get_temp_dir 
Remove get_temp_dir()
 2015-09-15 14:18:29 +02:00
Thomas Müller
474f13c9d6 Merge pull request #19041 from owncloud/issue-19007-parameter-name 
Fix parameter name to match the specs
 2015-09-15 14:15:46 +02:00