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

15947 commits

This branch
This branch
All branches
Author SHA1 Message Date
icewind1991
a27529709b Merge pull request #6647 from owncloud/memcache-public 
Add Memcache to the public api
 2014-02-04 05:38:53 -08:00
Vincent Petry
e266e50699 Merge pull request #7065 from owncloud/errorHandler_tests 
add test for the password remove method
 2014-02-04 05:36:17 -08:00
Bjoern Schiessle
36838b2837 add test for password remove method 2014-02-04 11:18:04 +01:00
Jan-Christoph Borchardt
49f0f9f2f6 Merge pull request #7057 from owncloud/pictures-icon 
better picture icon, fix https://github.com/owncloud/apps/issues/1401
 2014-02-03 15:57:41 -08:00
Jan-Christoph Borchardt
3692260174 Merge pull request #7055 from owncloud/ellipsize-modified-date 
ellipsize long modified dates to make room for showing delete button
 2014-02-03 15:57:00 -08:00
Jan-Christoph Borchardt
cfcd71f3e4 better picture icon, fix https://github.com/owncloud/apps/issues/1401 2014-02-03 18:47:25 +01:00
Jan-Christoph Borchardt
b56dbbe0e5 fix misalignment of modified dates, shift to right 2014-02-03 17:26:49 +01:00
Jan-Christoph Borchardt
6d7d3c16d0 ellipsize long modified dates to make room for showing delete button, fix #7040 2014-02-03 17:24:44 +01:00
Björn Schießle
9a0d7c5be4 Merge pull request #7014 from owncloud/fix_ocs_share_api 
remove needless element tag from the ocs share api
 2014-02-03 08:02:54 -08:00
Björn Schießle
c0aeaf9ec0 Merge pull request #7013 from owncloud/dont_write_passwords_to_log 
wrap stat() call in a try/catch block
 2014-02-03 07:58:44 -08:00
Bjoern Schiessle
cf5277b558 also load error handler if debugging is enabled 2014-02-03 12:08:28 +01:00
Bjoern Schiessle
44b637470c remove passwords in URLs from all log messages 2014-02-03 12:07:56 +01:00
icewind1991
cf6538abde Merge pull request #7025 from owncloud/prevent-double-app-load 
Mark an app as loaded before we start loading it
 2014-01-31 08:47:19 -08:00
Georg Ehrke
1f30bffba3 Merge pull request #7017 from owncloud/trashpreview 
Fixed image preview in trashbin subdirs
 2014-01-31 07:29:08 -08:00
Robin Appelman
0d9fe770f3 Mark an app as loaded before we start loading it 2014-01-31 15:12:21 +01:00
Morris Jobke
1a24bf4625 Merge pull request #5151 from owncloud/file-actions 
Slightly better looking file actions.
 2014-01-31 01:30:36 -08:00
raghunayyar
5ccb395ec6 Makes Rename Icon Width 44px for touch sourfaces. 2014-01-31 12:33:00 +05:30
Vincent Petry
c5767b67b1 Fixed image preview in trashbin subdirs 2014-01-30 17:03:13 +01:00
Bjoern Schiessle
f9d9a62e58 remove needless element tag 2014-01-30 13:34:41 +01:00
Vincent Petry
bc598f1919 Updated unit tests for rename action 
- rename action is now checked inside of ".nametext" element
- added test to ensure that display() correctly resets all actions
  including the rename one
 2014-01-30 10:07:08 +01:00
raghunayyar
85e67be0aa Rename action now appears as pencil icon 2014-01-30 10:07:08 +01:00
Raghu Nayyar
299a8285bd Merge pull request #6278 from nickvergessen/issue/6263 
[issue/6263] layout.user.php code is not valid markup
 2014-01-29 10:42:17 -08: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
Morris Jobke
afa00318bc Merge pull request #6900 from owncloud/files-errormessagewhentargetfoldermissing 
Added error message for when target folder was removed
 2014-01-29 07:48:50 -08:00
Jan-Christoph Borchardt
f5f918b8bf Merge pull request #6903 from owncloud/fix-ms-office-icons 
Add/fix Microsoft Office file icons.
 2014-01-29 07:31:25 -08:00
Morris Jobke
c65fac092d Merge pull request #6995 from jbtbnl/master 
Add white color variant of checkmark icon
 2014-01-29 06:32:34 -08: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
jbtbnl
f798ad9a20 Add white color variant of checkmark icon 2014-01-29 13:47:37 +01:00
Vincent Petry
58c7042e70 Added error message for when target folder was removed 
Whent trying to upload/rename/create files in a folder that was removed
or rename, the correct error message is now shown.

In the case of upload of multiple files, the upload is cancelled.

This situation can happen if the target folder was renamed or removed
from another browser window or client.
 2014-01-29 12:46:11 +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
Vincent Petry
a2b79ead2d Merge pull request #6990 from owncloud/files-fixrenamewarnings 
Fix warnings in logs when renaming over the web UI
 2014-01-29 02:21:30 -08: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
Vincent Petry
e6f93fc841 Fix warnings in logs when renaming over the web UI 
The determineIcon() method was expecting attributes to be set which
caused warnings about undefined indices in the error log.

This fix pre-initializes the array with 'directory' and
'isPreviewAvailable' to make them disappear.
 2014-01-29 10:43:13 +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
Thomas Müller
75c8d74c94 Merge pull request #6979 from owncloud/share_api_error_codes 
[ocs share api] use error code 403 if sharing is not permitted
 2014-01-28 07:28:07 -08:00
Bjoern Schiessle
7f83f2a8f2 use more accurate error codes 2014-01-28 13:31:43 +01:00
VicDeo
0a77d41178 Merge pull request #6965 from owncloud/unused-free-space 
Remove unused $freeSpace
 2014-01-27 10:27:51 -08:00
Robin Appelman
b590f019f6 Remove unused $freeSpace 2014-01-27 16:51:32 +01:00
Thomas Müller
ab9ddda8f2 Merge pull request #6907 from owncloud/webdav-logexceptions 
Added exception logger plugin for sabre connector
 2014-01-27 07:48:40 -08:00
Morris Jobke
25305a535b Merge pull request #6958 from owncloud/localised_date 
use localised date in notification mails
 2014-01-27 04:54:30 -08:00
Morris Jobke
d182b4f59f Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt 
remove the form, it isn't needed here
 2014-01-27 04:30:06 -08:00
Morris Jobke
b4d11df843 Merge pull request #6930 from jcfischer/master 
Add 'mail_from_address' configuration
 2014-01-27 04:27:35 -08:00
Morris Jobke
6ee1250d27 Merge pull request #6933 from seberm/master 
Add check for apc.enabled option
 2014-01-27 04:25:31 -08: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
Bjoern Schiessle
2bb13a8db9 use localised date in notification mails 2014-01-27 12:47:54 +01:00