Tom Needham
|
3d23e98390
|
Remove the WIP external sharing api
|
2012-12-31 16:31:22 +00:00 |
Tom Needham
|
6eb194b702
|
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
|
2012-12-31 15:47:15 +00:00 |
Jenkins for ownCloud
|
329bddab48
|
[tx-robot] updated from transifex
|
2012-12-31 00:05:31 +01:00 |
Lukas Reschke
|
f70f9f3bc4
|
Merge pull request #1043 from owncloud/fix_breadcrumb_slashes
Replace %2F with / in breadcrumbs
|
2012-12-30 08:56:32 -08:00 |
Jenkins for ownCloud
|
66e57f5fb1
|
[tx-robot] updated from transifex
|
2012-12-30 00:05:52 +01:00 |
Frank Karlitschek
|
e6de09c0a9
|
check if admin
|
2012-12-29 19:30:31 +00:00 |
Jenkins for ownCloud
|
0229b070c9
|
[tx-robot] updated from transifex
|
2012-12-29 19:30:31 +00:00 |
Michael Gapczynski
|
f94c26e573
|
Change post_write hook to write to prevent creating a duplicate of the original file on upload
|
2012-12-29 19:30:31 +00:00 |
Thomas Mueller
|
314dd4bacc
|
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
|
2012-12-29 19:30:31 +00:00 |
Michael Gapczynski
|
b5b48428ab
|
Replace %2F with / in breadcrumbs
|
2012-12-28 19:41:37 -05:00 |
Jenkins for ownCloud
|
9aefbea074
|
[tx-robot] updated from transifex
|
2012-12-29 00:08:28 +01:00 |
Thomas Mueller
|
a3206b4e97
|
only show the max possible upload of 2GB on a 32 bit system.
for a 64 bit system we have no such limitation
refs #856
Conflicts:
apps/files/templates/admin.php
|
2012-12-28 22:17:38 +01:00 |
Thomas Mueller
|
7b72424a39
|
Revert "fixed max possible upload size for files app in admin screen"
This reverts commit 7f2208b9a1 .
Conflicts:
apps/files/admin.php
|
2012-12-28 22:14:32 +01:00 |
Jenkins for ownCloud
|
e9c51b319e
|
[tx-robot] updated from transifex
|
2012-12-28 00:20:34 +01:00 |
Jenkins for ownCloud
|
27f9ea2abb
|
[tx-robot] updated from transifex
|
2012-12-27 00:05:17 +01:00 |
Jenkins for ownCloud
|
b7257b2524
|
[tx-robot] updated from transifex
|
2012-12-26 00:12:10 +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 |
Thomas Müller
|
39d874cd90
|
the maximum upload size is now part of the response of the upload and delete operation.
the maximum upload size is updated within the browser once an upload or delete operation has been finished
|
2012-12-20 17:16:53 +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 |
Björn Schießle
|
ec3c5f36cb
|
debug output removed
|
2012-12-18 13:26:10 +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 |
Björn Schießle
|
21cdf93616
|
remove DEFAULTMAXFILESIZE limit and make percentage of available space for versions configurable
|
2012-12-18 12:57:28 +01:00 |
Björn Schießle
|
e6e9d332cb
|
add missing bracket
|
2012-12-18 12:37:24 +01: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 |
Björn Schießle
|
0e0d54dc58
|
get timestamp from file instead from time(); typo fixed
|
2012-12-17 18:00:11 +01:00 |
Björn Schießle
|
2a42344781
|
don't check for min interval, no longer needed
|
2012-12-17 17:14:24 +01: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 |
Björn Schießle
|
75a871ecd7
|
expire all operation no longer needed; delete oldest versions if limit of empty space is reached
|
2012-12-17 16:32:09 +01:00 |
Frank Karlitschek
|
c4ecbad009
|
check if admin
|
2012-12-17 14:46:57 +01:00 |
Björn Schießle
|
a7bb4b128f
|
personal settings removed, there is no need to expire versions manually
|
2012-12-17 13:34:17 +01:00 |
Björn Schießle
|
acc902a0b6
|
remove blacklist
|
2012-12-17 13:30:18 +01:00 |
Björn Schießle
|
0a49fcf9d1
|
update files history according the given intervals
|
2012-12-17 13:28:40 +01:00 |
Björn Schießle
|
ee1ce6714b
|
add size to versions array
|
2012-12-17 11:39:57 +01:00 |
Björn Schießle
|
24d4f701bf
|
calculate free space for versions
|
2012-12-17 11:39:57 +01:00 |
Jenkins for ownCloud
|
dd5e39ca71
|
[tx-robot] updated from transifex
|
2012-12-17 00:10:49 +01:00 |
Tom Needham
|
3c98f36121
|
Merge branch 'master' into ocs_api
|
2012-12-16 22:29:00 +00: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 |
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 |
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 |
Tom Needham
|
5fe6129698
|
Merge master into ocs_api, fix conflicts.
|
2012-12-14 15:15:05 +00: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 |
Jan-Christoph Borchardt
|
e0ada2c24f
|
bring back fixed multiselect bar so it’s visible when scrolled down, fix #746
|
2012-12-13 19:44:55 +01:00 |
Jan-Christoph Borchardt
|
316a29f7ac
|
fix new button popup looking blurry
|
2012-12-13 19:04:27 +01:00 |
Robin Appelman
|
6a2b41e5e8
|
use json encoding when deleting multiply files instead of using ; as delimiter
|
2012-12-13 18:11:00 +01:00 |
blizzz
|
77c16b2933
|
Merge pull request #855 from owncloud/ungreenify
ungreenify new & upload buttons
|
2012-12-13 04:19:38 -08:00 |
blizzz
|
680ff3a51b
|
Merge pull request #584 from wardragon/ldap_access_userExists_fix
Really fix OCP\Share::shareItem with LDAP users
|
2012-12-12 16:59:43 -08:00 |
Jenkins for ownCloud
|
8686a448c7
|
[tx-robot] updated from transifex
|
2012-12-13 00:18:20 +01:00 |
Jan-Christoph Borchardt
|
e7c4a2c8e1
|
ungreenify new & upload buttons
|
2012-12-13 00:12:21 +01:00 |
Thomas Müller
|
8b4aad73c7
|
Merge pull request #810 from owncloud/send-share-link-by-email
restoring feature to send sharing link via email
|
2012-12-12 04:54:51 -08:00 |
Thomas Mueller
|
e8897c2b7e
|
prevent keyboardshortcuts from catching events outside the main doc - e.g. the share popup
|
2012-12-12 12:55:29 +01:00 |
Jenkins for ownCloud
|
bac4e011dc
|
[tx-robot] updated from transifex
|
2012-12-12 00:14:08 +01:00 |
Thomas Müller
|
2afc5abe19
|
Merge pull request #813 from owncloud/check_external_dependencies
Check external dependencies
|
2012-12-11 08:53:34 -08:00 |
Thomas Mueller
|
e427197dce
|
ctor of OC_L10N requires the app name
|
2012-12-11 14:07:01 +01:00 |
Frank Karlitschek
|
e55a3637ce
|
don't call shell_exec if safe_mode is on.
|
2012-12-11 13:20:20 +01:00 |
Jenkins for ownCloud
|
f7f462f273
|
[tx-robot] updated from transifex
|
2012-12-11 00:04:40 +01:00 |
Thomas Mueller
|
162a2c0fba
|
moving sharing email code to core
|
2012-12-10 23:22:42 +01:00 |
Frank Karlitschek
|
ca7882a7c6
|
disable not available external filesystems. Restructure the configuration a bit and improve naming
|
2012-12-10 21:44:43 +01:00 |
Frank Karlitschek
|
f3bd6d14ee
|
add some output why some of the external filesystems might not work
|
2012-12-10 21:10:28 +01:00 |
Thomas Mueller
|
45074d5023
|
restoring feature to send sharing link via email
|
2012-12-10 18:41:08 +01:00 |
Jenkins for ownCloud
|
a444999a8c
|
[tx-robot] updated from transifex
|
2012-12-10 00:12:32 +01:00 |
Thomas Müller
|
9a3a83e16a
|
Merge pull request #282 from butonic/fix_new_and_upload_button_html_css
fix_new_and_upload_button_html_css
|
2012-12-09 01:25:50 -08:00 |
Jenkins for ownCloud
|
e3e4dcf77b
|
[tx-robot] updated from transifex
|
2012-12-09 00:12:41 +01:00 |
Jenkins for ownCloud
|
2ca72d0da7
|
[tx-robot] updated from transifex
|
2012-12-08 00:10:53 +01:00 |
Jörn Friedrich Dreyer
|
787e8b86d9
|
cleanup CSS whitespace and remove extra input[type='checkbok']
|
2012-12-07 17:41:52 +01:00 |
Jörn Friedrich Dreyer
|
80d8ca24ec
|
fix svg -> png replacement for android, cleanup and remove obsolete css
|
2012-12-07 17:21:26 +01:00 |
Jörn Friedrich Dreyer
|
2ec96c7a63
|
fix new li icons jumping when replacing p with input
|
2012-12-07 17:21:26 +01:00 |
Jörn Friedrich Dreyer
|
8cf1e560bb
|
add IE9 CSS checkbox fixes
|
2012-12-07 17:21:26 +01:00 |
Lorenzo M. Catucci
|
de34f771c2
|
Exclude LDAP backend from global user searches
triggered by itself.
|
2012-12-07 17:19:30 +01:00 |
Jörn Friedrich Dreyer
|
810e02099e
|
upload button HTML, CSS & JS cleanup
|
2012-12-07 15:32:24 +01:00 |
Jörn Friedrich Dreyer
|
6864b28e47
|
rmeove vendor prefix for box-shadow
|
2012-12-07 15:32:24 +01:00 |
Jörn Friedrich Dreyer
|
76395057d4
|
fix_new_and_upload_button_html_css
|
2012-12-07 15:32:24 +01:00 |
Thomas Müller
|
380db4a29e
|
Merge pull request #640 from esthepiking/master
Keyboard Shortcuts
|
2012-12-06 13:42:14 -08:00 |
Björn Schießle
|
bf0f39f5b4
|
make sure that all expected array keys are available
|
2012-12-06 15:57:53 +01:00 |
Erik Sargent
|
f0213735fc
|
Code clean up
|
2012-12-05 08:23:28 -07:00 |
Jenkins for ownCloud
|
524f3c3c0b
|
[tx-robot] updated from transifex
|
2012-12-05 00:04:55 +01:00 |
Erik Sargent
|
93208d0fe9
|
Remove rename
|
2012-12-04 09:40:17 -07:00 |
Jenkins for ownCloud
|
a53a946c20
|
[tx-robot] updated from transifex
|
2012-12-04 00:07:11 +01:00 |
Arthur Schiwon
|
4cb760a924
|
LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes different problems, esp. with non-ascii characters in the dn (#631)
|
2012-12-03 12:55:42 +01:00 |
Björn Schießle
|
171e669dda
|
Merge pull request #650 from schiesbn/fix_fileVersioningForSharedFiles_master
fix regression in file versioning for shared files
|
2012-12-03 02:45:39 -08:00 |
Jenkins for ownCloud
|
f4d7955fe6
|
[tx-robot] updated from transifex
|
2012-12-03 00:05:40 +01:00 |
Björn Schießle
|
f66ebea5ca
|
fix typo in variable name
|
2012-12-02 12:50:07 +01:00 |
Björn Schießle
|
bafb78ac94
|
fix regression in file versioning for shared files
|
2012-12-02 12:46:07 +01:00 |
Thomas Müller
|
475fe281a4
|
Merge pull request #654 from butonic/checkstyle_fixes
fix checkstyle for files_encryption & files_encryption app, add whitespace for readability
|
2012-12-02 03:14:30 -08:00 |
Jenkins for ownCloud
|
401c56ce7b
|
[tx-robot] updated from transifex
|
2012-12-02 00:03:12 +01:00 |
Jenkins for ownCloud
|
c7c5e2a2e2
|
[tx-robot] updated from transifex
|
2012-12-01 00:03:27 +01:00 |
Erik Sargent
|
47fa3a8fe0
|
event.ctrlKey
|
2012-11-30 10:11:25 -07:00 |
Erik Sargent
|
5d13b0533d
|
event.ctrlKey
|
2012-11-30 10:10:00 -07:00 |
Erik Sargent
|
2160663309
|
ctrl issue fix
|
2012-11-30 08:43:24 -07:00 |
Jörn Friedrich Dreyer
|
92df70b6e5
|
fix checkstyle for files_external app, add whitespace for readability
|
2012-11-30 16:27:11 +01:00 |
Jörn Friedrich Dreyer
|
df21ebeaf7
|
fix checkstyle for files_encryption app, add whitespace for readability
|
2012-11-30 16:26:04 +01:00 |
Bart Visscher
|
8aba5874db
|
Merge pull request #644 from butonic/checkstyle_fixes
fix checkstyle for files app
|
2012-11-30 04:10:31 -08:00 |
Erik Sargent
|
6060d063a9
|
Cleanup
|
2012-11-29 16:52:41 -07:00 |
Jenkins for ownCloud
|
16a630024c
|
[tx-robot] updated from transifex
|
2012-11-30 00:05:16 +01:00 |
Jörn Friedrich Dreyer
|
3b83fe1530
|
fix checkstyle for files app
|
2012-11-29 18:33:15 +01:00 |
Erik Sargent
|
b6e3460871
|
documentation
|
2012-11-29 10:21:20 -07:00 |
Erik Sargent
|
fd4aecf525
|
cleanup
|
2012-11-29 10:18:34 -07:00 |
Robin Appelman
|
bcb27c81d4
|
use new obEnd function instead of ob_end_clean
|
2012-11-29 18:01:21 +01:00 |
Erik Sargent
|
dafe028c11
|
Rename
|
2012-11-28 21:00:11 -07:00 |
Erik Sargent
|
a73a263543
|
Enter
|
2012-11-28 19:58:42 -07:00 |
Erik Sargent
|
8802dac02a
|
Arrow key navigation
|
2012-11-28 17:32:05 -07:00 |
Jenkins for ownCloud
|
6c3f43b061
|
[tx-robot] updated from transifex
|
2012-11-29 00:04:57 +01:00 |
Erik Sargent
|
8722d3751c
|
Keys array
|
2012-11-28 10:36:54 -07:00 |
Erik Sargent
|
b78dc3f48a
|
keycode naming
|
2012-11-28 10:22:20 -07:00 |
Bart Visscher
|
9717cdb42e
|
Merge pull request #601 from butonic/add_drag_shadow_in_firefox
show drag shadow in firefox by using helper:'clone'
|
2012-11-28 09:00:12 -08:00 |
Erik Sargent
|
0c6b53c25e
|
no message
|
2012-11-28 09:55:38 -07:00 |
Erik Sargent
|
fa858d7149
|
initial setup
|
2012-11-28 09:50:54 -07:00 |
Erik Sargent
|
ccb9bb4be0
|
initial setup
|
2012-11-28 09:50:49 -07:00 |
Erik Sargent
|
5f03c306da
|
initial setup
|
2012-11-28 09:50:40 -07:00 |
Jenkins for ownCloud
|
1d4d4fd678
|
[tx-robot] updated from transifex
|
2012-11-28 00:11:21 +01:00 |
Jörn Friedrich Dreyer
|
9a441d3e3a
|
show drag shadow in firefox by using helper:'clone'
|
2012-11-27 17:38:21 +01:00 |
Jenkins for ownCloud
|
d251f04b98
|
[tx-robot] updated from transifex
|
2012-11-27 00:10:47 +01:00 |
Jörn Friedrich Dreyer
|
71e8755d31
|
Merge pull request #380 from butonic/feature_share_link_with_token
Feature share link with token
|
2012-11-26 07:42:53 -08:00 |
Arthur Schiwon
|
74cf3b5dfb
|
use normalizePath to have a proper target path
|
2012-11-26 14:35:13 +01:00 |
Arthur Schiwon
|
776be8d9f7
|
all but the first parameter are introduced by &
|
2012-11-26 14:34:28 +01:00 |
Arthur Schiwon
|
fdc7a8b204
|
make sure path starts with /
|
2012-11-26 14:34:09 +01:00 |
Jenkins for ownCloud
|
7892204077
|
[tx-robot] updated from transifex
|
2012-11-26 00:02:04 +01:00 |
Robin Appelman
|
eaf8399aaf
|
make sure the output buffer is closed when handeling webdav
|
2012-11-25 14:45:13 +01:00 |