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

10896 commits

Author SHA1 Message Date
Vincent Petry
dd4e0a8253 Make file action menu icon permanent 2015-08-10 14:12:34 +02:00
Vincent Petry
ca34921cdf Implement file actions dropdown 
File actions now have two types "inline" and "dropdown". The default is
"dropdown".
The file actions will now be shown in a dropdown menu.
 2015-08-10 14:12:34 +02:00
Vincent Petry
15e16d335d Merge pull request #17656 from owncloud/files-rightsidebar 
Basic work for right sidebar
 2015-08-10 13:14:15 +02:00
Vincent Petry
038d29b8de Fix unit test for tipsy->tooltip change 2015-08-10 11:23:39 +02:00
Roeland Jago Douma
f0b617b508 Use DI 
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
e84cffc063 Moved core apps to the capabilities manager 
* Files
* Files_Sharing
* Files_Trashbin
* Files_Versions
 2015-08-10 10:45:16 +02:00
Robin McCorkell
214729a552 Merge pull request #14779 from owncloud/use-iterator-directory 
Use the new IteratorDirectory instead of the fakedir wrapper
 2015-08-07 22:16:47 +01:00
Jan-Christoph Borchardt
09ca2e0291 Merge pull request #18125 from owncloud/filelist-emptycontentduringmask 
Make sure to hide empty content message when mask is shown
 2015-08-07 18:33:46 +02:00
Vincent Petry
b3a1aef934 Merge pull request #13641 from owncloud/cache-storage-status 
Store storage availability in database
 2015-08-07 17:31:03 +02:00
Vincent Petry
8e2369f72b Make sure to hide empty content message when mask is shown 2015-08-07 15:57:16 +02:00
Hendrik Leppelsack
7760300fca replace tipsy with tooltip 2015-08-07 12:33:50 +02:00
Arthur Schiwon
d1439ec104 fix tipsy gravity after rebase 2015-08-07 01:23:50 +02:00
Arthur Schiwon
9c402c761f fix timezone issue with unittest 2015-08-07 01:22:45 +02:00
Vincent Petry
bdfab8108e Fix sidebar mtime display unit test 2015-08-07 01:22:45 +02:00
Jan-Christoph Borchardt
eb323fe8de fix position of elements in right sidebar 2015-08-07 01:22:44 +02:00
Jan-Christoph Borchardt
3c36813ea7 fix right sidebar position and first style 2015-08-07 01:22:44 +02:00
Vincent Petry
781ba420c9 Use own tabs impl in files sidebar 
Also change style.
 2015-08-07 01:22:44 +02:00
Arthur Schiwon
5af59c6871 rename sidebar element and use css and js utility functions to core 2015-08-07 01:22:43 +02:00
Arthur Schiwon
f508cf40da sidebar shall not overlap but shrink the contnet 2015-08-07 01:22:43 +02:00
Arthur Schiwon
734c6b0b6f extend MainFileInfoDetailView JS tests 2015-08-07 01:22:43 +02:00
Arthur Schiwon
7a982872e7 Main view does not commands detail and tab views to render. Fixes JS tests. 
For a predictive behaviour we need to determine who is allowed to call render
methods on the views. Either, the main view is solely allowed to call render
and views do not do anything about output until then. Or, the main view relies
on the concrete views to be ready when things are about to be shown. The latter
approach has the advantage that concrete views know when they have to update
themselves (e.g. new data arrives or information change), but the main view
has now idea of the inner workings.
 2015-08-07 01:22:43 +02:00
Vincent Petry
e0bcd56402 More work on right sidebar unit tests 2015-08-07 01:22:43 +02:00
Vincent Petry
3e44ca6dc2 Added unit tests for right sidebar 2015-08-07 01:22:43 +02:00
Vincent Petry
f11946c8c0 Improve layout, fix mime icon 2015-08-07 01:22:43 +02:00
Vincent Petry
b6192db610 Disable right sidebar in public file list page 2015-08-07 01:22:43 +02:00
Vincent Petry
deb9d4d778 Right sidebar now has its own scrollbar 2015-08-07 01:22:43 +02:00
Vincent Petry
d0f73d78f3 Remove horizontal scroll caused by right sidebar 2015-08-07 01:22:43 +02:00
Vincent Petry
ad90ba27cd Styling fixes + hightlight in files sidebar 
Sidebar scrolls with contents
Highlight currently show file
 2015-08-07 01:22:43 +02:00
Vincent Petry
ff614a7dbd More fixes to the right sidebar 
Sidebar now works in all file list views.
Moved owner to share tab.
 2015-08-07 01:22:43 +02:00
Vincent Petry
12e5f310dd Improved right sidebar 
Added owner info.
Added animation, but causes scrollbal.
Default file action now when clicking on name directly.
Fixed icon.
Added empty share tab.
 2015-08-07 01:22:42 +02:00
Vincent Petry
9854e71d2c Basic work for right sidebar 
Adds right sidebar with registrable panels (still WIP)
 2015-08-07 01:22:42 +02:00
Vincent Petry
4c9f55a325 Merge pull request #17680 from owncloud/ftp-rmdir-file 
handle rmdir on files for ftp storages
 2015-08-06 18:05:28 +02:00
Vincent Petry
a594b41fb0 Fix namespace conflict in OC.Encryption JS code 2015-08-06 15:53:38 +02:00
Vincent Petry
78203ecc2f Merge pull request #18082 from owncloud/share-group-conflict 
Re-use the share entry we have for the shared storage instead of searching for it every time
 2015-08-06 12:21:59 +02:00
Jörn Friedrich Dreyer
52085cc1ef Merge pull request #16961 from owncloud/hardening-ldap 
Hardening home folder retrieval in user_ldap
 2015-08-06 11:32:43 +02:00
Arthur Schiwon
6787774a32 integration tests for hardening user home retrieval 2015-08-06 09:31:07 +02:00
Morris Jobke
7f44b0fd18 Merge pull request #18077 from owncloud/fix_18055 
Set proper mimetype for directories
 2015-08-05 23:38:02 +02:00
Robin Appelman
859da8f0b3 just pass the share instead of searching for it 2015-08-05 15:41:29 +02:00
Robin Appelman
085acaf6ba add unit tests for share target conflict with group shares 2015-08-05 15:41:03 +02:00
Roeland Jago Douma
bc91c5c2de Set proper mimetype for directories 2015-08-05 13:54:09 +02:00
Lukas Reschke
99224905d8 Use absolute namespace 2015-08-05 10:30:39 +02:00
Thomas Müller
728780aee8 Merge pull request #18024 from owncloud/phpseclib-2.0 
Update phpseclib to 2.0 for increased PHP7 compatibility
 2015-08-04 16:33:14 +02:00
Robin Appelman
7b70343dc3 fix infinite loops with propagating etags on reshares 2015-08-03 17:33:12 +02:00
Björn Schießle
4105d17133 Merge pull request #17989 from owncloud/enc_only_update_file_cache_once 
only update database on the first run
 2015-08-03 11:33:46 +02:00
Andreas Fischer
3b803db6d8 Update phpseclib to 2.0 2015-08-03 09:43:45 +02:00
Roeland Jago Douma
98a7e42ebb [provisioning api] Move away from OC\Util to OCP\Util 2015-08-02 10:27:36 +02:00
Roeland Jago Douma
cea72c47f9 [provisioning_api] Move tests to OCP 2015-08-02 10:22:26 +02:00
Roeland Jago Douma
a4822f9f9a [provisioning_api] Move part of apps to OCP 2015-08-02 10:22:26 +02:00
Roeland Jago Douma
97d79202ac [provisioning_api] OC_User to IUserSession 2015-08-02 10:22:26 +02:00
Roeland Jago Douma
9f59add9ed [provisioning_api] subadmin check for users 2015-08-02 10:22:26 +02:00
Roeland Jago Douma
b745e75737 [provisioning_api] Moved groups away from static stuff 2015-08-02 10:22:26 +02:00
Roeland Jago Douma
abca7737b7 [provisioning_api] Move users away from static code 2015-08-02 10:22:26 +02:00
Jenkins for ownCloud
54e94b95bc [tx-robot] updated from transifex 2015-08-01 01:55:02 -04:00
Bjoern Schiessle
2f4bebb045 only update database on the first run (first run = we have a version number from the old encryption app) 2015-07-31 10:47:02 +02:00
Jenkins for ownCloud
de01951da3 [tx-robot] updated from transifex 2015-07-31 01:56:30 -04:00
Morris Jobke
5699fff889 Merge pull request #17175 from owncloud/add-download-feedback 
Add loading spinner to download icon
 2015-07-30 16:34:35 +02:00
Jenkins for ownCloud
a07254856c [tx-robot] updated from transifex 2015-07-30 01:55:20 -04:00
Morris Jobke
0e922b1841 Only throw exception if on new LDAP setups 
* this is done by setting enforce_home_folder_naming_rule for the user_ldap
  app in the app settings
 2015-07-29 20:25:05 +02:00
Morris Jobke
3fa6f6f77c Hardening home folder retrieval in user_ldap 
* if the home folder naming rule is specified it should not fallback
  to the "use owncloud username as home folder" scenario
* this does not allow the mixed setup of users with the attribute
  and some users without the attribute (which then would fallback to
  "use owncloud username as home folder" rule) anymore
 2015-07-29 20:25:05 +02:00
Jan-Christoph Borchardt
033eacefd1 use inline confirm button style for password-protected links, ref #15176 2015-07-29 16:31:45 +02:00
blizzz
332492548f Merge pull request #17923 from owncloud/fix-17921 
Remove Log info when no group filter is set, fixes #17921
 2015-07-29 16:12:08 +02:00
blizzz
b0036ecff6 Merge pull request #17464 from owncloud/fix-17232 
fix uncaught exception on not permitted file types when setting avatar, fixes #17232
 2015-07-29 12:37:48 +02:00
blizzz
e0d5eb8989 remove unused var 2015-07-29 12:10:33 +02:00
Jenkins for ownCloud
e77b2e5317 [tx-robot] updated from transifex 2015-07-29 01:55:08 -04:00
Robin McCorkell
6f72c37464 Merge pull request #17922 from owncloud/smb-storageiddoubleslash 
Double slash for SMB storage id for compatibility
 2015-07-28 19:54:11 +01:00
Vincent Petry
761ba344b7 Double slash for SMB storage id for compatibility 2015-07-28 11:41:54 +02:00
blizzz
81f5672393 Remove Log info when no group filter is set, fixes #17921 
The log message is superfluous and too noisy. If an admin decides not to use groups, he does not need to be reminded about it on almost every request.
 2015-07-28 11:41:21 +02:00
Morris Jobke
4076f84f88 Merge pull request #17910 from owncloud/fix-modified-tooltip 
Fix tooltip for modification time
 2015-07-28 08:41:26 +02:00
Jenkins for ownCloud
c683b1d3c9 [tx-robot] updated from transifex 2015-07-28 01:55:00 -04:00
Arthur Schiwon
0967a54755 fix test after rebasing 2015-07-27 17:34:45 +02:00
Arthur Schiwon
b37d62d9d3 fix uncaught exception on not permitted file types when setting avatar, fixes #17232 2015-07-27 17:27:00 +02:00
Arthur Schiwon
85b7bde7d4 add integration tests for avatar update 2015-07-27 17:27:00 +02:00
Arthur Schiwon
68706de45b refactor integration tests to make it easier to add new ones 2015-07-27 17:27:00 +02:00
Thomas Müller
68f14a943a Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption 
Only set is encrypted when encryption is enabled
 2015-07-27 16:06:39 +02:00
Hendrik Leppelsack
f67477206b fixed tooltip for modified date 2015-07-27 15:56:03 +02:00
Bjoern Schiessle
5923270004 add condition to update query 2015-07-27 12:08:13 +02:00
Morris Jobke
933f087d21 Merge pull request #17526 from owncloud/fix-17516 
LDAP: when checking group for matching filter, also take base DN into…
 2015-07-27 08:38:45 +02:00
Jenkins for ownCloud
bacada263c [tx-robot] updated from transifex 2015-07-27 01:54:38 -04:00
Jenkins for ownCloud
1e48eb8882 [tx-robot] updated from transifex 2015-07-25 01:54:48 -04:00
Joas Schilling
20cf8ec205 Add an update script to reset the value 
In case encryption was not enabled, we accidently set encrypted = 1 for
files inside mount points, since 8.1.0. This breaks opening the files in
8.1.1 because we fixed the code that checks if a file is encrypted.
In order to fix the file, we need to reset the flag of the file. However,
the flag might be set because the file is in fact encrypted because it was
uploaded at a time where encryption was enabled.

So we can only do this when:
- Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2)
- Encryption is disabled
- files_encryption is not known in the app config

If the first two are not the case, we are save. However, if files_encryption
values exist in the config, we might have a false negative here.
Now if there is no file with unencrypted size greater 0, that means there are
no files that are still encrypted with "files_encryption" encryption. So we
can also safely reset the flag here.

If this is not the case, we go with "better save then sorry" and don't change
the flag but write a message to the ownCloud log file.
 2015-07-24 10:37:39 +02:00
Bernhard Posselt
582f07950f Merge pull request #17075 from owncloud/bootstrap-tooltip 
Replace jQuery tipsy with bootstrap tooltip
 2015-07-23 19:25:09 +02:00
Jenkins for ownCloud
9ccf94ca06 [tx-robot] updated from transifex 2015-07-23 01:55:22 -04:00
Morris Jobke
296ed4c276 Merge pull request #17413 from owncloud/public-api-querybuilder 
Add public api for Doctrine QueryBuilder and ExpressionBuilder
 2015-07-22 17:29:08 +02:00
Robin McCorkell
145ab3a28d Merge pull request #17806 from owncloud/enc_improved_app_description 
improved app description for the default encryption module
 2015-07-22 15:06:08 +01:00
Joas Schilling
a1037f1679 Do not use magic strings when there are constants for it 2015-07-22 15:10:34 +02:00
Joas Schilling
270ec3aaba Make the favorite type stream only 2015-07-22 15:10:34 +02:00
Bjoern Schiessle
e97c1db728 improved app description and adjust it to the way the new encryption module works 2015-07-22 13:43:46 +02:00
Morris Jobke
009d1f3214 move updateFileActionSpinner to OCA.Files.FileActions 2015-07-22 10:35:15 +02:00
Viktor Szépe
4699a29a70 Fixing line comments and indentation 2015-07-21 22:19:53 +02:00
Joas Schilling
f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling
de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Morris Jobke
2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group 
[sharing] fix addToGroup hook
 2015-07-21 13:30:41 +02:00
Joas Schilling
a35193c704 Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection 
fix system wide mount point detection on migration
 2015-07-21 11:06:02 +02:00
Jenkins for ownCloud
24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Robin McCorkell
df19cabb44 Store storage availability in database 
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.

Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
 2015-07-20 16:27:26 +01:00
Bjoern Schiessle
570dd17d4f fix mount point detection 2015-07-20 16:00:33 +02:00
Björn Schießle
89d6439445 Merge pull request #17701 from owncloud/fix_repeated_migration 
don't move keys if the key where already moved in a previous migration run
 2015-07-20 15:12:52 +02:00
Robin McCorkell
d3bcafe618 Update .user.ini when setting upload size limit 2015-07-20 12:52:43 +01:00
blizzz
f573659b3a Merge pull request #17723 from owncloud/fix-17631 
fix runtime caching in ldap's user manager, fixes #17631
 2015-07-20 09:29:15 +02:00
Jenkins for ownCloud
83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00