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

16542 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
7f24d42ca5 Propagate unencrypted_size up to the file cache root 2014-03-07 11:00:22 +01:00
Vincent Petry
536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace 
Fixed upload issue when free space is not known (ex: FTP)
 2014-03-06 17:22:40 +01:00
Vincent Petry
1b8cf18c91 Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix 
Fix imagerotate and move loadFromBase64() one up
 2014-03-06 17:18:17 +01:00
Morris Jobke
256dca935b Revert "adding new javascript function OC.generateUrl(url, params)" 
This reverts commit 8e667d1934.
 2014-03-06 15:10:32 +01:00
Morris Jobke
5f0a22586f Merge pull request #7579 from owncloud/introduce-generateUrl-master 
Introduce OC.generateUrl() in master
 2014-03-06 15:07:28 +01:00
Vincent Petry
6e4ea09d52 Merge pull request #7494 from owncloud/fix-7307 
Replace OC.Router.generate() with OC.generateUrl()
 2014-03-06 14:49:12 +01:00
Vincent Petry
bfd0d799d8 Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4 
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
 2014-03-06 14:11:44 +01:00
Vincent Petry
a2e4452ed3 Merge pull request #7588 from owncloud/noise-repeat 
fix noise not repeating
 2014-03-06 14:08:46 +01:00
Vincent Petry
0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Vincent Petry
07f78c8248 Added unit tests for "add()" method for file upload 
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
  cases
 2014-03-06 13:53:34 +01:00
Vincent Petry
e129f6845b Added testArea for JS Unit tests 
Added a testArea that is outside the viewport but still considered as
visible from the jQuery code.

The testArea is useful when:
- tested code tries to access DOM elements using global ids
- tested code is requiring some UI elements to be visible to activate
  themselves
 2014-03-06 12:50:18 +01:00
Jan-Christoph Borchardt
0b0687c9fc fix noise not repeating 2014-03-06 12:38:11 +01:00
Georg Ehrke
eb5265b106 fix merge conflicts 2014-03-06 11:55:45 +01:00
Thomas Müller
b46517f012 adding js unit tests for OC.generateUrl() 2014-03-06 00:26:57 +01:00
Thomas Müller
8e667d1934 adding new javascript function OC.generateUrl(url, params) 2014-03-06 00:17:48 +01:00
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Vincent Petry
1785c0c9b9 Merge pull request #7575 from owncloud/issue/7571 
Do not set #dir when on public.php
 2014-03-05 19:57:25 +01:00
Lukas Reschke
e3156fa5ad Merge pull request #7354 from pschmitt/master 
Use 'command -v' to detect whether and where software is installed (instead of 'which')
 2014-03-05 19:25:09 +01:00
Joas Schilling
1ab10cb4f7 Do not set #dir when on public.php 
Fix #7571
 2014-03-05 18:46:55 +01:00
Björn Schießle
9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder 
don't allow to create a file or folder named 'Shared' in the root folder
 2014-03-05 18:13:31 +01:00
Jan-Christoph Borchardt
36fcb0fb4e Merge pull request #7569 from owncloud/scrutinizer-tabs 
fix some spaces to tabs issues reported by Scrutinizer
 2014-03-05 18:10:01 +01:00
Morris Jobke
0980c48526 Merge pull request #7568 from owncloud/lib_preview_add_fclose 
add fclose, fixes issue from bdb96b9af8
 2014-03-05 17:36:53 +01:00
Morris Jobke
8c1cd2b83e Merge pull request #7566 from owncloud/button-outlines 
Adds 0 Outlines to Buttons
 2014-03-05 16:50:22 +01:00
Georg Ehrke
dbf83aada2 fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case 2014-03-05 15:57:45 +01:00
Jan-Christoph Borchardt
7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Georg Ehrke
32a5d51fa6 add fclose, fixes issue from bdb96b9af8 2014-03-05 15:37:26 +01:00
Morris Jobke
37d22bf170 Merge pull request #7558 from owncloud/fix_issue_loading_cached_thumb 
fix issue with spamming logging files when loading cached thumbnail
 2014-03-05 15:23:35 +01:00
raghunayyar
5a9689eb5c Adds 0 Outlines to Buttons 2014-03-05 19:36:36 +05:30
Raghu Nayyar
859cac197e Merge pull request #7560 from owncloud/icons.css-star-fix 
add hover/focus states for star icons to hint at action
 2014-03-05 19:15:33 +05:30
Jan-Christoph Borchardt
bd86642747 Merge pull request #7261 from owncloud/issue/6793 
Allow admins to disable certain external storages for users
 2014-03-05 14:41:36 +01:00
Vincent Petry
36d7c0b6a7 Merge pull request #7556 from owncloud/enc_dont_create_files_folder 
[enc] don't create users files folder
 2014-03-05 13:30:11 +01:00
Jan-Christoph Borchardt
4d679de30b add hover/focus states for star icons to hint at action 2014-03-05 13:21:33 +01:00
Georg Ehrke
bdb96b9af8 fix issue with spamming logging files when loading cached thumbnail 2014-03-05 13:20:50 +01:00
Joas Schilling
d583d61b69 Merge pull request #7412 from owncloud/issue/7175 
Add button to send a test mail after changing the email settings
 2014-03-05 13:18:41 +01:00
Bjoern Schiessle
2e73c957e5 don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-05 13:16:25 +01:00
Bjoern Schiessle
fbd8c00a89 don't create files folder, let ownCloud core handle it 2014-03-05 12:44:02 +01:00
Vincent Petry
2cfd875e61 Merge pull request #7012 from owncloud/display-share-owner-master 
adding share owner information to the file list
 2014-03-05 12:43:10 +01:00
Morris Jobke
a8ae2f10b9 Merge pull request #7554 from owncloud/issue/7304 
Fix position of eye icon on database password field
 2014-03-05 11:13:43 +01:00
Vincent Petry
6de370b64c Removed obsolete OC.Router stubs in specHelper 2014-03-05 10:27:15 +01:00
Joas Schilling
4ee4f0c365 Fix position of eye icon on database password field 
Fix #7304
 2014-03-05 10:22:35 +01:00
Joas Schilling
5b8cde48dc Add button to send a test mail after changing the email settings 
Fix #7175
 2014-03-05 10:01:34 +01:00
Thomas Müller
33b798c3d6 fixing js unit tests 2014-03-05 01:10:39 +01:00
Thomas Müller
7edd8df07f Merge pull request #7521 from owncloud/docstrings_2_kondou 
Fix some more docstrings
 2014-03-05 00:40:49 +01:00
Vincent Petry
1da90fab84 Merge pull request #7508 from owncloud/ldap-configkeycasing 
Fixed configkey casing for PostgreSQL
 2014-03-04 17:08:29 +01:00
Tom Needham
9986b470ee Merge pull request #7251 from owncloud/fix-ocsapi-getuser 
Add displayname for admins on external api
 2014-03-04 15:37:45 +00:00
Vincent Petry
620dd4afbd Merge pull request #7481 from tripflex/fix_downloadlink_spaces 
replace spaces in download link without encoding entire URL
 2014-03-04 16:33:41 +01:00
Thomas Müller
f42b6f1a4e Merge pull request #7525 from owncloud/fix_S3string 
fix https://github.com/owncloud/core/issues/6825
 2014-03-04 14:30:30 +01:00
Frank Karlitschek
0bca969e99 fix https://github.com/owncloud/core/issues/6825 2014-03-04 12:38:56 +01:00
Raghu Nayyar
7c3f3cc933 Merge pull request #7522 from owncloud/email-field-wording 
update wording of email field
 2014-03-04 15:05:22 +05:30
Morris Jobke
af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +01:00