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

26889 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
8f3884145e less stupid initalization of subviews 2015-09-16 07:23:26 +02:00
Arthur Schiwon
ffd4e0dc5a split off expirationView 2015-09-16 07:23:26 +02:00
Arthur Schiwon
f9c232c4ce split off linkShareView 2015-09-16 07:23:26 +02:00
Arthur Schiwon
277b786886 ShareDialogResharerInfoView improvements 2015-09-16 07:23:26 +02:00
Arthur Schiwon
dcb084a617 split ShareDialogResharerInfoView from base view 2015-09-16 07:23:26 +02:00
Arthur Schiwon
1bd6942be7 show tooltips and load avatar 2015-09-16 07:23:25 +02:00
Arthur Schiwon
e3fd96fa8e improve doc 2015-09-16 07:23:25 +02:00
Arthur Schiwon
a57ff13a23 move remaining global settings to configModel 2015-09-16 07:23:25 +02:00
Arthur Schiwon
83d91ddf20 further work on reimplementing the dialog layout 2015-09-16 07:23:25 +02:00
Arthur Schiwon
b015eff2e9 improve reshare rendering part and move permission calculation to model 2015-09-16 07:23:25 +02:00
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
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
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
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
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
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
Robin Appelman
8767c2b3be fix small mimetype icons 2015-09-15 15:40:42 +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
Lukas Reschke
2f4a1c9c2c Merge branch 'master' into dont-add-requestheaders-for-cross-domain-requests 2015-09-15 14:04:40 +02:00
Lukas Reschke
7953cc9494 Function does return void 
This function does return void and not a bool.
 2015-09-15 14:02:10 +02:00
Thomas Müller
e82a225d04 Merge pull request #18964 from owncloud/availability-integer 
Use integer for availability instead of bool
 2015-09-15 13:24:55 +02:00
Thomas Müller
b6fe5b6f3c Merge pull request #19039 from owncloud/setup-autoloader-earlier 
Define allowed app roots earlier
 2015-09-15 13:24:35 +02:00
Joas Schilling
665716095b Fix parameter name to match the specs 2015-09-15 12:14:14 +02:00