Commit graph

4090 commits

Author SHA1 Message Date
Michael Gapczynski
fb053f8e73 Fix retrieving of shared source paths 2012-12-29 11:09:57 -05:00
Michael Gapczynski
8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Michael Gapczynski
1910057900 Fix shared statuses inside folders 2012-12-26 16:20:10 -05:00
Robin Appelman
7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Jenkins for ownCloud
5d59ac0739 [tx-robot] updated from transifex 2012-12-25 00:11:11 +01:00
Jenkins for ownCloud
7d52c39419 [tx-robot] updated from transifex 2012-12-24 00:12:16 +01:00
Jenkins for ownCloud
0656b41747 [tx-robot] updated from transifex 2012-12-23 00:10:23 +01:00
Jenkins for ownCloud
05fda76776 [tx-robot] updated from transifex 2012-12-22 00:26:25 +01:00
Jenkins for ownCloud
3e39c39d6a [tx-robot] updated from transifex 2012-12-21 00:11:31 +01:00
Jan-Christoph Borchardt
bdc8d0098a Merge pull request #869 from owncloud/files-styles
Files styles
2012-12-20 05:39:09 -08:00
Jan-Christoph Borchardt
86d510ba28 fix switched values from previous commit 2012-12-20 13:30:57 +01:00
Jan-Christoph Borchardt
373b69d835 Merge pull request #974 from owncloud/fixing-120-master
setting the timezone is now part of the login process
2012-12-20 04:02:22 -08:00
Bart Visscher
8e44404ae0 Merge pull request #925 from owncloud/fix_issue_918
Trigger the last action before continuing with a file upload
2012-12-20 03:30:50 -08:00
Jan-Christoph Borchardt
babc0e4ac6 fix Firefox issues with file actions position and multiselect bar width 2012-12-20 12:02:19 +01:00
Jan-Christoph Borchardt
aa5f726f14 use slightly darker color for file actions background, fix fugly look for selected rows 2012-12-20 11:24:25 +01:00
Jan-Christoph Borchardt
c05ea8cfc3 fix file actions messing with file row height on narrower screens 2012-12-20 11:14:27 +01:00
Thomas Müller
a1bf6b54e6 remove timezone.js 2012-12-20 11:14:21 +01:00
Thomas Müller
7d811e57e6 setting the timezone is now part of the login process and true part of the core. 2012-12-20 11:10:45 +01:00
Jan-Christoph Borchardt
5107ccbeda move CSS from JS to CSS 2012-12-20 10:53:50 +01:00
Frank Karlitschek
7c5150ce32 Merge pull request #913 from owncloud/fix_settings
cleaning up the settings
2012-12-18 15:27:52 -08:00
Jenkins for ownCloud
982e46cd29 [tx-robot] updated from transifex 2012-12-19 00:04:14 +01:00
Thomas Müller
b0532c6343 Merge pull request #905 from owncloud/fix_mountpointescaping
proper escape the mountpoints.
2012-12-18 04:01:07 -08:00
Jenkins for ownCloud
a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Thomas Müller
b8f749420b Merge pull request #929 from owncloud/fix_utf8_filenames_in_ie_download
fix utf8 filenames in ie download response header according to rfc5987, ...
2012-12-17 14:53:15 -08:00
Jörn Friedrich Dreyer
b6eb95349e fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http 2012-12-17 16:46:07 +01:00
Thomas Müller
d085fdf8ea Merge pull request #842 from owncloud/restrict_keyboard_shortcuts
prevent keyboardshortcuts from catching events outside the main doc - e....
2012-12-17 07:38:53 -08:00
Frank Karlitschek
c4ecbad009 check if admin 2012-12-17 14:46:57 +01:00
Jenkins for ownCloud
dd5e39ca71 [tx-robot] updated from transifex 2012-12-17 00:10:49 +01:00
Michael Gapczynski
915126cae8 Trigger last action before continuing with creating a new file/folder/from link 2012-12-16 16:25:08 -05:00
Michael Gapczynski
2607c565b0 Trigger the last action before continuing with a file upload, fixes issue #918 2012-12-16 16:19:51 -05:00
Michael Gapczynski
63a2271c78 Change post_write hook to write to prevent creating a duplicate of the original file on upload 2012-12-16 15:08:18 -05:00
Michael Gapczynski
bf05ff351f Initial support for file sharing with filesystem branch 2012-12-15 19:44:59 -05:00
Jenkins for ownCloud
0c87f666ad [tx-robot] updated from transifex 2012-12-16 00:12:10 +01:00
Frank Karlitschek
30b0e8b70c cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-) 2012-12-15 20:02:16 +01:00
Robin Appelman
946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher
6ff38624a7 Merge pull request #875 from owncloud/multiplefiles_json
use json when deleting multiply files instead of using ; as delimiter
2012-12-14 16:26:09 -08:00
Bart Visscher
df7d6cb26c More style fixes 2012-12-15 00:43:46 +01:00
Bart Visscher
68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Bart Visscher
2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Bart Visscher
85bd28c508 Fix some of "Closing brace must be on a line by itself" 2012-12-15 00:43:46 +01:00
Bart Visscher
f39454ed12 Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
Bart Visscher
8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +01:00
Frank Karlitschek
262fecbe39 proper escape the mountpoints. Fixes
https://github.com/owncloud/core/issues/557
2012-12-14 23:31:50 +01:00
Arthur Schiwon
f0893fb8fe Give also hint about possible conflicts in the user_webdavauth description 2012-12-14 12:03:46 +01:00
Arthur Schiwon
414b7e8e03 Also show a more prominent warning when php_ldap is not installed 2012-12-14 12:03:29 +01:00
Arthur Schiwon
b54390f432 Show conflict warning when user_ldap and user_webdavauth are enabled 2012-12-14 12:03:21 +01:00
Arthur Schiwon
5cbe8d637b Show conflict warning when user_ldap and user_webdavauth are enabled 2012-12-14 12:03:15 +01:00
Jenkins for ownCloud
6d7ae463df [tx-robot] updated from transifex 2012-12-14 00:17:42 +01:00
Robin Appelman
1443d6c3ef fix mimetype icons for new files 2012-12-13 22:31:43 +01:00
Robin Appelman
fda7d932ef remove unneeded line 2012-12-13 22:12:27 +01:00