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

2767 commits

Author SHA1 Message Date
Vincent Petry
31d62c10bf Merge pull request #17501 from tbartenstein/patch-1 
Update fileinfo.php
 2015-08-24 09:57:27 +02:00
tbartenstein
5e1c2aecc7 fix unit test for folder renaming (icon) 
fix unit test to go with #17501 and check for the new icon
 2015-08-21 18:54:09 +02:00
Vincent Petry
7c64ae4663 Add namespace in case the file is loaded individually 
Some apps might load this file in JS unit tests and need the OCA.Files
namespace to exist.
 2015-08-20 17:54:52 +02:00
Robin McCorkell
67893ca839 Merge pull request #18380 from owncloud/files-sidebar-selectbar 
Fix files select bar width when app sidebar is visible
 2015-08-20 12:35:33 +01:00
Vincent Petry
5fd36d017e Merge pull request #18378 from owncloud/files-delete-spinner 
Fix spinner when deleting all files in a folder
 2015-08-19 14:31:23 +02:00
Vincent Petry
bd6beaaae2 Merge pull request #18354 from owncloud/files-fixdnd 
Fix file drag and drop JS error
 2015-08-19 14:30:21 +02:00
Thomas Müller
0b37004808 Merge pull request #18076 from owncloud/fix-thumbnail-api-master 
No need to url decode the file
 2015-08-19 09:59:14 +02:00
Thomas Müller
9f6c33abe9 Merge pull request #18339 from owncloud/update-jquery-visibility 
update jquery-visibility in files app
 2015-08-19 09:54:05 +02:00
Morris Jobke
7b0f43efb6 Merge pull request #18381 from owncloud/public-share-fixdepsloading 
Fix file actions menu in public page
 2015-08-18 13:58:03 +02:00
Vincent Petry
37a842a18e Only show delete action in menu when delete permission exists 
This reverts an older decision where we said the delete action must
always appear but be grayed out when the permission is missing.
The actions menu obsoletes that.
 2015-08-18 11:35:40 +02:00
Vincent Petry
170259e840 Fix files select bar width when app sidebar is visible 2015-08-18 11:30:00 +02:00
Vincent Petry
730f1d199a Fix spinner when deleting all files in a folder 2015-08-18 11:14:41 +02:00
Vincent Petry
ffff156965 Merge pull request #18310 from hasso/selection-string-fix 
Fix the string counting a selected files/dirs
 2015-08-18 10:43:17 +02:00
Hasso Tepper
bbff530b65 Move decaration to the beginning of the block 2015-08-18 10:34:30 +03:00
Vincent Petry
009c008ed8 Fix file drag and drop JS error 2015-08-17 16:09:29 +02:00
Hasso Tepper
97bc73ad49 Update unit test to reflect the string change 2015-08-17 15:31:44 +03:00
Hasso Tepper
72799ffba2 Move selectionVars into if statement 2015-08-17 15:28:55 +03:00
Robin McCorkell
675d852c7d Merge pull request #17182 from owncloud/user_ini_upload_size 
Update .user.ini when setting upload size limit
 2015-08-17 13:27:47 +01:00
Morris Jobke
51c3a3ddaf update jquery-visibility in files app 
* ref #12877
 2015-08-17 09:39:21 +02:00
Morris Jobke
5b7143885d Merge pull request #18318 from owncloud/files-sidebar-fixtabs 
Improve right sidebar tabs behavior
 2015-08-16 12:53:50 +02:00
Thomas Müller
dfba425d68 Integration in files app to load scripts and styles on request 2015-08-14 18:04:17 +02:00
Vincent Petry
e2549fa660 Improve right sidebar tabs behavior 
Tab heads are not rendered if only one tab.

The tab contents is updated on-demand. This means that if a tab is not
visible it is not rendered at first. If the tab was already rendered
through switching, its model will not get updated until the next time it
becomes visible. This will prevent needless rerendering of invisible tab
contents, especially considering that some tabs might need extra ajax
requests.
 2015-08-14 16:51:04 +02:00
Hasso Tepper
69c550ce51 Fix the string counting a selected files/dirs 
The old one contains untranslatable ' & ' if both files and dirs are
selected. The new code is especially designed to reuse strings from file
listing summary view (apps/files/js/filesummary.js), so no translation
is broken.
 2015-08-14 14:50:25 +03:00
Jan-Christoph Borchardt
4e53b5922d Merge pull request #18178 from owncloud/files-sidebar-actions 
Sidebar file actions
 2015-08-13 17:17:10 +02:00
Vincent Petry
b811124aac Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporary 
Show storage full warning for shared storages temporary
 2015-08-13 10:05:53 +02:00
Hendrik Leppelsack
e5444a1a5d replace tipsys with tooltips 2015-08-12 23:09:49 +02:00
Vincent Petry
c964eff17b Make file actions work from sidebar 
The favorite icon in the sidebar now triggers the file action and also
updates itself according to the model's state when triggered from the
file row.

The thumbnail triggers the default action.

Currently only one FileInfoModel is used for the selection and state
synchronization between views.

FileList reload now auto-closes the sidebar.
 2015-08-12 17:30:20 +02:00
Vincent Petry
997577cf7a Introduce FileInfoModel 
FileInfoModel is a backbone model that will make it possible to track
changes and update views accordingly
 2015-08-12 17:29:54 +02:00
Morris Jobke
e6bf4e559a Show strage full warning for shared storages temporary 
* removed the setDefault call because then it will always be
  reshown
  * was added with ba475d4862
* fixes #18208
 2015-08-12 14:14:43 +02:00
Thomas Müller
eb13cb8d75 Merge pull request #18127 from owncloud/dav-request-tests 
add test framework for doing full request webdav tests
 2015-08-12 10:07:20 +02:00
Jan-Christoph Borchardt
d04a6bce6f Merge pull request #17709 from owncloud/fileactions-dropdown 
Move file actions to dropdown
 2015-08-11 15:13:59 +02:00
Robin Appelman
b0c8654f9e split out creating the sabre dav server to it's own factory 2015-08-11 14:43:46 +02:00
Morris Jobke
0abc637782 Merge pull request #18171 from owncloud/fix-language-of-files-activities-in-emails 
Correctly make use of the languageCode argument in the files activity extension
 2015-08-11 12:34:58 +02:00
Vincent Petry
984ae8140d Fixed file actions menu to close when reclicking trigger 
FileActionsMenu is now a backbone view.
The trigger and highlight handling is now done in the
FileActions.showMenu() method using events.
 2015-08-11 11:35:46 +02:00
Joas Schilling
acd54fbeda Merge pull request #16528 from owncloud/activity-302-improve-settings 
Activity 302 improve settings
 2015-08-11 11:24:27 +02:00
Roeland Douma
c2856c05aa Merge pull request #15093 from rullzer/capabilities_manager 
Capabilities manager
 2015-08-10 20:33:50 +02:00
Vincent Petry
86e1eaf370 Inline actions using default renderer are now always permanent 
Default renderer like the favorite icon can decide whether to use the
permanent class or not.

Fixed sharing code to properly update the icon according to sharing
state modifications.
 2015-08-10 15:57:21 +02:00
Joas Schilling
81c3bbad57 Correctly make use of the languageCode argument in the files activity extension 2015-08-10 14:40:33 +02:00
Jan-Christoph Borchardt
08912308a0 fix width of action dropdown and last layout details 2015-08-10 14:16:49 +02:00
Jan-Christoph Borchardt
1283ecac23 remove whitespace on right cause of moved delete icon 2015-08-10 14:16:42 +02:00
Jan-Christoph Borchardt
5e7e0c7e2d fix ellipsizing for file names 2015-08-10 14:16:36 +02:00
Jan-Christoph Borchardt
28abbb1485 fix layout and design of actions dropdown 2015-08-10 14:16:26 +02:00
Vincent Petry
b142fbe6d7 Added bubble style, applied to file actions menu 2015-08-10 14:12:34 +02:00
Vincent Petry
9454e9043a Updated unit tests for file actions and actions menu 2015-08-10 14:12:34 +02:00
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
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
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
Thomas Müller
2128bd69de No need to url decode the file 2015-08-05 13:21:04 +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
Jenkins for ownCloud
e77b2e5317 [tx-robot] updated from transifex 2015-07-29 01:55:08 -04: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
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
Jenkins for ownCloud
bacada263c [tx-robot] updated from transifex 2015-07-27 01:54:38 -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
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
Morris Jobke
009d1f3214 move updateFileActionSpinner to OCA.Files.FileActions 2015-07-22 10:35:15 +02:00
Robin McCorkell
d3bcafe618 Update .user.ini when setting upload size limit 2015-07-20 12:52:43 +01:00
Roeland Jago Douma
b0f21c0a43 The external directories should get the correct icon 2015-07-17 14:30:12 +02:00
Robin Appelman
23d1cf26b9 Lock scanner to the given user 2015-07-15 14:08:06 +02:00
Morris Jobke
43afa4c0e3 refactor this to proper separation of concerns 2015-07-15 11:14:20 +02:00
Jenkins for ownCloud
bfd7194cf9 [tx-robot] updated from transifex 2015-07-11 01:54:51 -04:00
Roeland Jago Douma
eb7a796ad9 Fix unit tests 2015-07-09 18:42:46 +02:00
Roeland Jago Douma
7d943b2ddc Make the filelist get the mimetypeicon from the mimetype 2015-07-09 13:56:43 +02:00
Roeland Jago Douma
a727cbc7a9 Remove ajax/mimeicon.php and its route 2015-07-09 13:40:13 +02:00
Roeland Jago Douma
5c381ea532 Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl 2015-07-09 13:40:13 +02:00
Roeland Jago Douma
1aa2f6638f Make getMimeIcon use OC.MimeType.getIconUrl 2015-07-09 13:40:12 +02:00
Jenkins for ownCloud
6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Hendrik Leppelsack
03a6e12bdb fix tipsy dependency 2015-07-08 10:55:53 +02:00