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

1057 commits

Author SHA1 Message Date
Thomas Müller
9e59e64c79 Merge pull request #7421 from owncloud/password-input 
disable autocomplete for shared link password input, fix #7419
 2014-02-26 22:21:00 +01:00
Björn Schießle
b7385986ae Merge pull request #7393 from owncloud/fix_path_in_sharing_results 
fix path in sharing results if it is a file in the Shared folder
 2014-02-26 15:19:30 +01:00
Jan-Christoph Borchardt
6c5cc46380 disable autocomplete for shared link password input, fix #7419 2014-02-26 14:48:15 +01:00
Bjoern Schiessle
3be5e48b0c only add "received_from" if a share was found 2014-02-26 12:52:35 +01:00
Bjoern Schiessle
e3f676e009 fix path in sharing results if it is a file in the Shared folder 2014-02-25 17:27:23 +01:00
Morris Jobke
5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg 
Show svg mime icons when no preview is available
 2014-02-24 14:12:10 +01:00
Bjoern Schiessle
0c0e4fced5 fix test so that it doesn't depend on the array order 2014-02-21 13:37:47 +01:00
Bjoern Schiessle
6ca4d3bfde fix usersPath and add unit tests 2014-02-21 13:37:46 +01:00
Robin Appelman
0624476aa1 Merge branch 'master' into mimeicons-svg 2014-02-20 16:55:18 +01:00
Robin Appelman
f33d35cd07 Fix svg icons for public shares and external/shared files 2014-02-19 15:08:05 +01:00
Vincent Petry
952584e9c7 Merge pull request #7195 from owncloud/files-selectall 
Do not send file list for select all on Download/delete
 2014-02-19 14:33:24 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1 Scrutinizer Auto-Fixes 
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720

Enabled analysis tools:
 - PHP Analyzer
 - JSHint
 - PHP Copy/Paste Detector
 - PHP PDepend
 2014-02-19 09:31:54 +01:00
Thomas Müller
c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/migration/content.php
 2014-02-18 18:31:33 +01:00
Thomas Müller
1e84d6b14b Merge pull request #7190 from owncloud/appconfig-legacy-apps 
Remove usage of legacy OC_Appconfig
 2014-02-18 18:10:22 +01:00
Matthew Caron
aa1a50f5b3 Consolidate two sections, per code review. Issue #1648 2014-02-17 12:57:54 -05:00
Thomas Müller
9fac95c2ab Merge branch 'master' into scrutinizer_documentation_patches 
Conflicts:
	lib/private/appconfig.php
 2014-02-14 23:03:27 +01:00
Matthew Caron
2887fb1f48 Fit shared videos to viewer, just like images. Issue #1648 2014-02-14 16:09:51 -05:00
Vincent Petry
d7f4547717 Merge pull request #6726 from owncloud/fix_6630 
don't urldecode get var, php does this automatically
 2014-02-14 14:34:20 +01:00
Vincent Petry
d5397d813c Do not send file list for select all on Download/delete 
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
  with root
- Delete will send "allfiles" to the server that will find the file
  list or the passed directory by itself
 2014-02-13 20:28:52 +01:00
Robin Appelman
181bbd4325 Remove usage of legacy OC_Appconfig 2014-02-13 16:28:49 +01:00
Bjoern Schiessle
a8943ad022 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef polish documentation based on scrutinizer patches 2014-02-06 17:02:21 +01:00
Vincent Petry
aff1cafaca Merge pull request #7089 from owncloud/sharing-searchbymime 
Fixed searchByMime in shared cache
 2014-02-06 14:15:00 +01:00
Pellaeon Lin
946fccc0dd Remove unused template variable assignment of files_sharing/template/public.php 2014-02-06 12:26:36 +08:00
Pellaeon Lin
8c56e21ced Move template variable assignment to correct place 2014-02-06 12:06:16 +08:00
Vincent Petry
fa5ddc3e18 Fixed searchByMime in shared cache 
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime
 2014-02-05 13:29:06 +01:00
Jan-Christoph Borchardt
0609f30d1c Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg 
Change misleading message when file size exceeds upload limit
 2014-02-04 08:04:19 -08:00
Vincent Petry
d49c7ad4fb Fixed double file encoding for previews 2014-01-30 16:34:37 +01:00
Georg Ehrke
c5742520e1 don't urldecode get var, php does this automatically 2014-01-30 16:32:45 +01:00
Pellaeon Lin
099b71c712 Merge branch 'master' into pr-exceed_upload_limit_msg 
Conflicts:
	apps/files/templates/index.php
	apps/files_sharing/templates/public.php
 2014-01-30 22:50:20 +08:00
Bjoern Schiessle
f9d9a62e58 remove needless element tag 2014-01-30 13:34:41 +01:00
Jan-Christoph Borchardt
271088a7a2 Merge pull request #6777 from owncloud/mobile-style 
Mobile style for public links: files, folders, picture sets
 2014-01-29 09:17:02 -08:00
Jan-Christoph Borchardt
edea7781b7 make header scroll up for single shares, more view of content on small screens 2014-01-29 17:20:55 +01:00
Thomas Müller
7655728ddf - adding class to header div: share-folder or share-file 
- for supported previews are shown with a size of 500px; icons with a size of 128px
 2014-01-29 16:52:30 +01:00
Jan-Christoph Borchardt
5a869732d1 adjust file type icon placement for when no preview can be generated 2014-01-29 15:28:57 +01:00
Björn Schießle
609d5f2458 Merge pull request #6987 from owncloud/share_api_and_encryption 
[ocs share api] public upload is also possible with encryption enabled, since OC6
 2014-01-29 02:50:25 -08:00
Jan-Christoph Borchardt
d310df505c permanently show download action on mobile, only icon 2014-01-29 11:43:34 +01:00
Jan-Christoph Borchardt
8f81f007cd fix horizontal scrollbar appearing when footer is too long, footer wraps now 2014-01-29 11:06:19 +01:00
Jan-Christoph Borchardt
13ed59c1cf merge master into mobile-style 2014-01-29 10:55:44 +01:00
Morris Jobke
cf2c061f1f Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink 
Sharing fixfiledownloadlink
 2014-01-29 00:39:14 -08:00
Bjoern Schiessle
cd4e044f66 public upload is also possible with encryption enabled, since OC6 2014-01-28 17:28:20 +01:00
Bjoern Schiessle
7f83f2a8f2 use more accurate error codes 2014-01-28 13:31:43 +01:00
Morris Jobke
0a1708ba11 Merge pull request #6912 from owncloud/replace-webroot-in-css 
Remove %webroot% from CSS
 2014-01-27 04:11:15 -08:00
Jan-Christoph Borchardt
46745895ae Merge pull request #5153 from owncloud/core-em-to-px 
Cleans up Core apps for relative(em) to absolute(px) styles.
 2014-01-27 02:29:47 -08:00
Vincent Petry
c6695bbd76 Fixed download URL in public page 
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
 2014-01-24 13:38:39 +01:00
Thomas Müller
617aa3cf29 Instead of 'No preview available for ...' we simple display the mieme-type icon 2014-01-23 20:15:10 +01:00
Jan-Christoph Borchardt
799e744ad7 remove background and width from multiselect bar, fix Download button not showing on mobile 2014-01-23 15:35:30 +01:00
Jan-Christoph Borchardt
f0c9e8205f remove %webroot from files_sharing app 2014-01-23 14:04:13 +01:00
Morris Jobke
4b7dfd34f8 fix conflicts and add missing closing tag 2014-01-23 13:51:51 +01:00
Thomas Müller
ade726ad32 focus link text only on click in the input field - closes #6817 2014-01-23 01:08:42 +01:00