Jenkins for ownCloud
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
Sam Tuke
3b9e2f1bab
Merge branch 'master' into files_encryption-style-fixes
...
Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-02-05 18:43:55 +00:00
Sam Tuke
a528f96b84
Merge branch 'master' into files_encryption-style-fixes
2013-02-05 18:23:03 +00:00
Lukas Reschke
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
Sam Tuke
20b1d12cbf
Fixed comment typo, wrapped return value conditional on var assignment in session{}
2013-02-05 17:28:26 +00:00
Sam Tuke
4ba0ab7f65
Added missing translation wrapping
2013-02-05 17:22:59 +00:00
Sam Tuke
b84e83261e
Added notice to personal settings indicating what filetypes are not encrypted
2013-02-05 17:06:15 +00:00
Bart Visscher
3e7ca373ec
Only calculate md5 of local file once
2013-02-05 17:56:51 +01:00
Bart Visscher
148e4facfa
Change files_versions namespace to OCA\Files_Versions
2013-02-05 17:46:39 +01:00
Sam Tuke
680c5b3dad
Removed debugging output
2013-02-05 16:11:50 +00:00
Sam Tuke
221b69dd0e
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
2013-02-05 16:09:01 +00:00
Sam Tuke
a1f200c1e5
Cleaned up path formatting with new method stripUserFilesPath()
2013-02-05 15:59:28 +00:00
Sam Tuke
53248a9b60
Recryption of legacy encrypted files now working on login
2013-02-05 15:35:29 +00:00
Sam Tuke
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
Sam Tuke
927d4c98a1
Fixed todos: undefined vars and unreachable code
2013-02-05 13:12:34 +00:00
Michael Gapczynski
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Thomas Tanghus
68fe6d0077
Merge pull request #1432 from owncloud/add_requesttoken
...
[user_webdavauth] add requesttoken
2013-02-04 12:02:16 -08:00
Thomas Tanghus
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
Björn Schießle
fee3f80501
Merge pull request #1434 from owncloud/trashbin_CSRF
...
[files_trashbin] Add CSRF token
2013-02-04 02:14:52 -08:00
Lukas Reschke
8add89ced1
OCP\JSON instead of OCP\User
2013-02-04 09:15:11 +01:00
Thomas Müller
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
Thomas Müller
5ceddabaa6
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
...
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
Robin Appelman
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
Jenkins for ownCloud
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
Lukas Reschke
018c5f69c0
[files_trashbin] Add CSRF token
2013-02-03 22:49:12 +01:00
Lukas Reschke
bce59c3945
[user_webdavauth] add requesttoken
2013-02-03 19:58:55 +01:00
Thomas Tanghus
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
Thomas Müller
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
Jenkins for ownCloud
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
TheSFReader
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
Lukas Reschke
23166aa016
Merge pull request #1415 from owncloud/ldap_fix_settings
...
LDAP settings Advanced tab has grown too long by far. Structure it using accordion.
2013-02-01 16:35:55 -08:00
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
Arthur Schiwon
10ad5f923a
remove ugly whitespace
2013-02-01 23:52:41 +01:00
Arthur Schiwon
a7d82ad0ee
LDAP: settings Advanced tab has grown too long by far. Structure it using accordion
2013-02-01 23:48:22 +01:00
TheSFReader
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
Sam Tuke
0677d56ee2
Added debugging output relating to recrypting legacy files
2013-02-01 19:31:15 +00:00
TheSFReader
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
Thomas Mueller
fb0a5f3224
undelete -> restore
2013-02-01 00:43:52 +01:00
Jenkins for ownCloud
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
Michael Gapczynski
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
Thomas Mueller
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Thomas Mueller
c1072d0c09
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-31 23:26:40 +01:00
Thomas Mueller
2af6d74bc1
Merge branch 'master' into fixing-js-errors-public-link-master
...
Conflicts:
apps/files/js/files.js
apps/files/templates/part.list.php
2013-01-31 23:23:10 +01:00
Thomas Müller
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
Thomas Mueller
fc585623a5
spell check
...
👍
2013-01-31 22:49:07 +01:00
Arthur Schiwon
a1dc24c9da
LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multiple server support)
2013-01-31 21:19:24 +01:00
Sam Tuke
06847f609b
Improved support for detecting and recrypting legacy files. Bugs remain.
2013-01-31 19:40:51 +00:00
Robin Appelman
697536cf6a
Trash: use the same sorting algoritm as files
2013-01-31 19:36:59 +01:00
Jan-Christoph Borchardt
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
Robin Appelman
9d74ce4595
Trash: fix opening folders
2013-01-31 19:20:22 +01:00
Sam Tuke
c6b3bdd5a0
Fixed compatibility with filecache rewrite merge
2013-01-31 17:51:46 +00:00
Stefan Herbrechtsmeier
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
blizzz
411e8e5218
Merge pull request #1365 from owncloud/ldap_multiple_server
...
LDAP: support for multiple LDAP/AD servers
2013-01-31 09:24:45 -08:00
Robin Appelman
3756f235ce
Trash: enable fileactions while viewing trash
2013-01-31 18:14:22 +01:00
Robin Appelman
73cd116968
Trash: don't use depricated filesystem api classes
2013-01-31 18:04:00 +01:00
Arthur Schiwon
afacaf8bc2
string fragment was added by accident and does not belong here
2013-01-31 18:00:07 +01:00
Robin Appelman
4d3d8ed296
Trash: highlight Files navigation entry while in trash
2013-01-31 17:59:01 +01:00
Robin Appelman
5417e44b2a
Files: fix moving files by DnD
2013-01-31 17:56:44 +01:00
Thomas Mueller
19714151e2
spell check
2013-01-31 17:53:01 +01:00
Thomas Mueller
5862f3d140
spell check
2013-01-31 17:51:59 +01:00
Sam Tuke
2183f77527
Fixed incompatibilities with filecache rewrite merge
2013-01-31 16:49:07 +00:00
Thomas Mueller
7f2d7cdbe1
spell check
2013-01-31 17:44:25 +01:00
Thomas Mueller
a17a7f5cdb
adding l10n support to user_ldap
2013-01-31 17:43:24 +01:00
Sam Tuke
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
Jenkins for ownCloud
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
Thomas Mueller
4162ba4d41
adding l10n support to files_trashbin
2013-01-31 16:48:41 +01:00
Jan-Christoph Borchardt
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
Björn Schießle
8dd9dedee8
Merge pull request #1266 from schiesbn/trash_bin
...
Trash bin
2013-01-31 06:18:22 -08:00
Robin Appelman
54d46fe43c
remove outdated line
2013-01-31 15:00:48 +01:00
Björn Schießle
c8a4878b77
is_writable() is now isUpdatable() with the new filesystem
2013-01-31 14:55:14 +01:00
Björn Schießle
dff5148f6d
debug output removed
2013-01-31 14:48:57 +01:00
Björn Schießle
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
Björn Schießle
9c83b307f6
keep mtime
2013-01-31 10:50:02 +01:00
Björn Schießle
2ddd40ed41
rename 'undelete' to 'restore'
2013-01-31 10:06:02 +01:00
Arthur Schiwon
2f11d7fe12
LDAP: adjust settings interface for custom search attributes
2013-01-31 02:10:13 +01:00
Arthur Schiwon
1a854454d6
LDAP: avoid attempts to save null as configvalue
2013-01-31 02:00:29 +01:00
Arthur Schiwon
0b98dc30b2
LDAP: remove unnecessary placeholders, fixes PHP warnings
2013-01-31 01:56:16 +01:00
Arthur Schiwon
b5ed8b2751
LDAP: fix wrong index
2013-01-31 01:46:54 +01:00
Arthur Schiwon
b3b0544e17
LDAP: make it possible to define attributes that should be considered on searches
2013-01-31 01:46:34 +01:00
Jenkins for ownCloud
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
Sam Tuke
c7b1bdf00e
Fixed handling of keyfile subdir creation
...
Improved keyfile subdir deletion (1 bug remains here)
2013-01-30 18:52:02 +00:00
Robin Appelman
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
Robin Appelman
95352fbc15
Files: Dont get maxUploadSize if the filecache needs to be upgraded
2013-01-30 19:19:19 +01:00
Sam Tuke
61b23ce6cc
Working on support for deleting directories (removing all keyfiles)
2013-01-30 17:25:17 +00:00
Thomas Mueller
8ded07dd5c
first style fixes - @samtuke: I added some TODO regarding undefined variables and unreachable code - please review
2013-01-30 17:49:05 +01:00
Jörn Friedrich Dreyer
263c3f3a42
attach on to filelist instead of individual td elements for file link behaviour
2013-01-30 17:10:40 +01:00
Jörn Friedrich Dreyer
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
Björn Schießle
9ca0a93847
make spinner title translatable
2013-01-30 16:20:13 +01:00
Björn Schießle
c62a38fcb1
add spinner for undelete operation for visualisation
2013-01-30 15:35:24 +01:00
Björn Schießle
1592764a60
show a spinner instead of the delete button while moving files to the trash bin
2013-01-30 14:32:20 +01:00
Jan-Christoph Borchardt
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
Arthur Schiwon
8f388d9df4
LDAP: update link to online documentation
2013-01-30 13:48:59 +01:00
Jörn Friedrich Dreyer
81a398c22c
use $.trim() for IE8
2013-01-30 13:29:24 +01:00
Björn Schießle
e6f1544f51
fix OC_Log::ERROR call
2013-01-30 13:04:32 +01:00
Björn Schießle
a6e5f4b85c
some minor improvements
2013-01-30 13:01:53 +01:00
Jörn Friedrich Dreyer
99dfaee1f6
reset checkbox after getting selected files instead of ofter dragging, speed up revert
2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
1d0ee61f3a
use post instead of get
2013-01-30 12:59:35 +01:00
Jörn Friedrich Dreyer
0089b17749
add multselect dnd
2013-01-30 12:59:34 +01:00
Thomas Müller
5761bd771f
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
...
hide upload progress bar and cancel action in IE < 10
2013-01-30 02:48:12 -08:00
Björn Schießle
d6adab6734
improved message if trash bin is empty
2013-01-30 10:07:29 +01:00
Arthur Schiwon
8fd263ef63
LDAP: update quota on every uncached userExists, i.e. also on every isLoggedIn, fixes #1278
2013-01-30 03:57:46 +01:00
Arthur Schiwon
e8db1e884e
LDAP: some inline documentation
2013-01-30 03:44:11 +01:00
Arthur Schiwon
14bc6f8c6c
LDAP: working visual feedback on save. Save button will be highlighted green or red.
2013-01-30 03:34:51 +01:00
Arthur Schiwon
19867b1d08
LDAP: make sure app meta data is not deleted from database when deleting configuration with empty prefix
2013-01-30 02:39:44 +01:00
Arthur Schiwon
a557522037
LDAP: send back error message properly
2013-01-30 02:39:11 +01:00
Arthur Schiwon
9f7d780276
LDAP: use consolidated method for determining config prefix
2013-01-30 02:31:14 +01:00
Arthur Schiwon
a8ac4bdf79
LDAP: Always preset configuration prefix when no configuratin is stored or all remaining ones are deleted
2013-01-30 02:30:24 +01:00
Jenkins for ownCloud
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Sam Tuke
c1f20fe37a
Made encyrption keyfiles be deleted when their parents are
...
Made encryption keyfiles be renamed when their parents are
Fixed bugs with encryptAll() execution on login
2013-01-29 19:54:40 +00:00
Arthur Schiwon
f33b72677b
LDAP: implement support for ownCloud Display Names
2013-01-29 20:41:48 +01:00
Björn Schießle
0c8bcacdc8
added some additional error handling
2013-01-29 13:36:33 +01:00
Björn Schießle
eafd34684c
seperate css no longer needed, use files app css instead
2013-01-29 10:08:41 +01:00
Björn Schießle
d10e137939
icons added; empty trash bin message added
2013-01-29 10:03:04 +01:00
Michael Gapczynski
5143660cd3
Merge pull request #1324 from owncloud/permanent-share-icons
...
Permanently display shared status icons
2013-01-28 20:17:40 -08:00
Jenkins for ownCloud
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
Robin Appelman
a67f11c8af
Sharing: partailly fix searchByMime
2013-01-28 21:25:19 +01:00
Robin Appelman
86e5a9cd73
Files: fix sharing newly uploaded files
2013-01-28 21:09:18 +01:00
Robin Appelman
929b8c3e69
fix files_version hooks
2013-01-28 20:04:10 +01:00
Robin Appelman
7207211f3a
change required ownCloud version to 4.91
2013-01-28 19:58:24 +01:00
Jan-Christoph Borchardt
01b3c088a9
fix color change on click
2013-01-28 19:47:51 +01:00
Robin Appelman
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
Jan-Christoph Borchardt
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
Robin Appelman
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
Björn Schießle
320233ec3d
merge conflict fixed
2013-01-28 15:10:00 +01:00
Björn Schießle
f28857377d
use hidden input field to disable sharing
2013-01-28 11:28:16 +01:00
Björn Schießle
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
Jan-Christoph Borchardt
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
Thomas Mueller
11e88f4939
call ajax scan only if a user is logged in - otherwise we'll get a 500
2013-01-28 09:48:03 +01:00
Thomas Mueller
47ce3c2160
include keyboardshortcuts.js
2013-01-28 09:47:21 +01:00
Thomas Mueller
03a1a20316
fixing href for folders
2013-01-28 09:46:52 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Michael Gapczynski
10c428830e
Add create permission, fixes #780
2013-01-27 23:31:31 -05:00
Robin Appelman
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
Jenkins for ownCloud
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
Henrik Kjölhede
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
hkjolhede
a26d50640f
Update apps/files_external/lib/sftp.php
...
Added cleaning the root path
2013-01-26 19:46:23 +01:00
Robin Appelman
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
Lukas Reschke
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
Lukas Reschke
6c882d9806
Remove outdated comments
2013-01-26 14:03:17 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
raghunayyar
a86da16a10
More Style Fixes
...
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Björn Schießle
839f4bd949
show display name instead of uid in the public shared files view
2013-01-25 13:01:53 +01:00
Jenkins for ownCloud
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
Arthur Schiwon
3e99f12120
LDAP: make settings strings in JS translatable
2013-01-24 22:47:25 +01:00
Arthur Schiwon
2749a14171
LDAP: make it possible to enable/disable server configurations
2013-01-24 22:39:05 +01:00
Sam Tuke
094213e231
Fixed many coding guidelines issues
...
Continued work on upgrade path via login hook listener
New spec file with notes
2013-01-24 18:37:34 +00:00
Thomas Mueller
ef88ceba8c
drop SimpleTest compatibility
2013-01-24 16:47:17 +01:00
Björn Schießle
dbb0d04073
restore file in the root folder if the origin folder is not writable
2013-01-24 15:29:22 +01:00
Arthur Schiwon
6bc7256966
LDAP: forgotten file for deleteConfig feature
2013-01-24 14:12:12 +01:00
Arthur Schiwon
5b9e181198
LDAP: implement deleteConfiguration feature
2013-01-24 14:11:53 +01:00
Arthur Schiwon
3bf38c7a84
LDAP: add missing new LDAP Helper
2013-01-24 13:01:43 +01:00
Arthur Schiwon
fccfdb2a52
LPAP: cleanup settings.php, it's already ajaxified
2013-01-24 13:01:20 +01:00
Arthur Schiwon
b2ea78c00d
LDAP: improve and cleanup settings JS
2013-01-24 13:00:40 +01:00
Arthur Schiwon
b084ed6a42
LDAP: clean up, save configuration is now handled by Ajax
2013-01-24 12:46:10 +01:00
Arthur Schiwon
319dcd45e1
LDAP: Clear cache on saving settings
2013-01-24 12:44:30 +01:00
Arthur Schiwon
96949fc9dd
LDAP: consolidate config prefix determination, autofill combo box in settings
2013-01-24 12:42:28 +01:00
Jenkins for ownCloud
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
Arthur Schiwon
b979bf6f1c
LDAP: fix default
2013-01-23 23:46:55 +01:00
Arthur Schiwon
06c284f6cc
LDAP settings: read configuration when another server config is chosen
2013-01-23 23:41:35 +01:00
Arthur Schiwon
83d9e1e2f0
make sure that Configuration is read when getConfiguration is called. And give back the appropriate result.
2013-01-23 23:40:21 +01:00
Sam Tuke
59ca312263
Work on util: findFiles() and encryptAll(); both close to working
...
Ecnryption unit tests are failing, recursion in filecache{}
2013-01-23 19:24:26 +00:00
Sam Tuke
cd832935e8
Merge branch 'files_encryption'
2013-01-23 12:54:09 +00:00
Björn Schießle
6ab95e8e33
code clean-up
2013-01-23 11:30:42 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Thomas Mueller
5fadd53088
missing renames of publicListView to disableSharing
2013-01-23 09:18:26 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Robin Appelman
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
Björn Schießle
367aadb3b7
rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view
2013-01-22 18:34:59 +01:00
Sam Tuke
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke
47592657d7
Added localisation for encryption settings
2013-01-22 17:15:03 +00:00
Björn Schießle
f919230f63
remove inline JavaScript
2013-01-22 17:59:33 +01:00
Sam Tuke
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
Björn Schießle
16ae902e31
no undo notification for deleted file, we use the trash bin instead
2013-01-22 17:43:46 +01:00
Björn Schießle
b694f996d9
allow admin to change retention obligation for the trash bin, default value is 180 days
2013-01-22 15:33:54 +01:00
Björn Schießle
16d7716dee
calculate correct relative date for trashbin file list
2013-01-22 15:33:54 +01:00
Björn Schießle
97e69e5374
remove table row in trash bin view after undelete
2013-01-22 15:33:54 +01:00
Björn Schießle
81ab0affef
allow to restore single files/folder from a deleted folder
2013-01-22 15:33:54 +01:00
Björn Schießle
1817c7895b
allow to look into deleted directories
2013-01-22 15:33:54 +01:00
Björn Schießle
1255791ef2
handle group restore
2013-01-22 15:33:54 +01:00
Björn Schießle
655a20f963
expire files in trash bin after 30 days
2013-01-22 15:33:54 +01:00
Björn Schießle
8e57fe1a08
remove unneeded function
2013-01-22 15:33:54 +01:00
Björn Schießle
a3da82261b
remove item in the trash bin view after successful undelete
2013-01-22 15:33:53 +01:00
Björn Schießle
d605228937
first version of the trash bin app
2013-01-22 15:33:53 +01:00
Björn Schießle
8259768732
introduce option to disable download action
2013-01-22 15:33:53 +01:00
Björn Schießle
dfab3d3d7f
call the trash bin view
2013-01-22 15:33:53 +01:00
Björn Schießle
9bacb0e179
rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view
2013-01-22 15:33:53 +01:00
Björn Schießle
f15deaf556
listen to post delete event to allow the trash bin to create a copy of the version first
2013-01-22 15:32:57 +01:00
Björn Schießle
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
Lukas Reschke
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
Michael Gapczynski
e666ce3622
Fix external storage UI for new storage namespaces
2013-01-21 23:57:26 -05:00
Robin Appelman
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
Lukas Reschke
8223117569
Remove closing tag
2013-01-21 22:29:27 +01:00
Robin Appelman
1762378f67
Files: don't load fileactions.js when upgrading filecache
2013-01-21 22:07:55 +01:00
Lukas Reschke
9bc8df3649
Move publicListView to external JS
2013-01-21 20:36:19 +01:00
Lukas Reschke
0d02caa684
No inline JS in apps
2013-01-21 20:34:28 +01:00
Jenkins for ownCloud
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
Arthur Schiwon
10876aba89
fix more config keys for save settings handling
2013-01-20 18:30:14 +01:00
Arthur Schiwon
0c3466325b
fix continue in switch, add another key to skip
2013-01-20 18:27:39 +01:00
Arthur Schiwon
6d84aa93d3
Ajaxifiy Settings Save
2013-01-20 18:02:44 +01:00
Robin Appelman
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
Jenkins for ownCloud
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
Thomas Mueller
5d6c1d52bd
replace #notification with OC.Notification call
2013-01-19 21:37:05 +01:00
Thomas Mueller
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
Lukas Reschke
53b95cb8fd
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php
...
Remove uneeded file
2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt
ae244972cb
Merge pull request #1228 from owncloud/generating_zip_message
...
Make the ZIP download information friendlier
2013-01-19 04:33:39 -08:00
Lukas Reschke
02bd8dd45a
Change the second part of the notification
2013-01-19 13:12:27 +01:00
Michael Gapczynski
8ca30d244c
Implement getETag() in shared storage
2013-01-19 00:02:40 -05:00
Thomas Mueller
1dd70ac506
update used space percent after each ajax call and display the notification
2013-01-19 00:31:49 +01:00
Thomas Mueller
cdd07b3339
introducing class OCA/files/lib/Helper with new function to build an array with storage stats
...
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
2013-01-19 00:31:09 +01:00
Jenkins for ownCloud
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
Thomas Mueller
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Lukas Reschke
f447e6469f
Remove uneeded file
...
I don't saw any usage of this file through the code, I assume it can
safely be removed.
2013-01-18 23:07:11 +01:00
Thomas Müller
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
Lukas Reschke
ad57db3e87
Make the message friendlier
2013-01-18 22:35:26 +01:00
Jörn Friedrich Dreyer
5e16510a53
hide upload progress bar and cancel action in IE < 10
2013-01-18 22:06:42 +01:00
Thomas Mueller
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
Jan-Christoph Borchardt
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
Arthur Schiwon
229a25f41a
fix mixed key and value
2013-01-18 13:53:26 +01:00
Arthur Schiwon
805f900b19
LDAP: pass defaults to settings form, and restore them on creating a new configuration if wanted
2013-01-18 13:45:39 +01:00
Arthur Schiwon
229d484200
LDAP: gather defaults in one place, simplify readConfiguration
2013-01-18 13:35:40 +01:00
Arthur Schiwon
1c19e66712
coding style
2013-01-18 11:42:34 +01:00
Arthur Schiwon
a53addf825
LDAP: first basics for multiserver config ui
2013-01-18 01:23:15 +01:00
Jenkins for ownCloud
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
Thomas Mueller
130c9cad03
relative storage info without decimals
2013-01-17 16:52:57 +01:00
Thomas Mueller
b7d3bf5f81
rename space -> storage
2013-01-17 16:49:10 +01:00
Arthur Schiwon
d8be83029b
make sure port is used as backup port if not specified. documentation. determine connection error earlier.
2013-01-17 13:56:37 +01:00
Arthur Schiwon
59a6068246
fix undeclared variable
2013-01-17 13:46:32 +01:00
Arthur Schiwon
3d56cf3a5b
LDAP: add support for backup/replica servers
2013-01-17 13:31:14 +01:00
Jenkins for ownCloud
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
Robin Appelman
bb43cf378b
Files: make sure keybinds js is loaded after files js
2013-01-16 21:36:25 +01:00
Robin Appelman
5445b94416
merge master into filesystem
2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa
Whitespace cleanup
2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Arthur Schiwon
6063ce9c8d
LDAP: enable support for multiple LDAP/AD servers
2013-01-16 14:59:41 +01:00
Arthur Schiwon
4699f36e44
LDAP: fix read configuration, remove unnecessary debug output
2013-01-16 14:58:49 +01:00
Arthur Schiwon
ad1113c2cb
LDAP: fix parameter passed not as expected
2013-01-16 14:56:57 +01:00
Björn Schießle
2b9c925a2b
Merge pull request #1192 from schiesbn/versioning_history_issue_1189
...
fix for issue #1186 , missing variables added
2013-01-16 01:26:43 -08:00
Björn Schießle
73c4d0faff
initialize $versionCreated
2013-01-16 10:20:09 +01:00
Jenkins for ownCloud
0398bfffca
[tx-robot] updated from transifex
2013-01-16 00:21:21 +01:00
Robin Appelman
7debfac0dc
Cache: more efficient upgrading
2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
Bart Visscher
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Robin Appelman
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
Jan-Christoph Borchardt
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
Björn Schießle
60d5d5f636
fix for issue #1186 , missing variables added
2013-01-15 14:34:15 +01:00
blizzz
bb9cc227c2
Merge pull request #1087 from owncloud/ldap_multiple_dns
...
LDAP: ability to configure more than one base DN
2013-01-15 04:01:57 -08:00
Jenkins for ownCloud
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
Bart Visscher
7455056d2d
Merge pull request #1169 from owncloud/webdav_L10n
...
user_webdavauth - l10n - Trivial
2013-01-14 12:28:51 -08:00
Lukas Reschke
9eb16e06f7
Merge pull request #1135 from owncloud/allow_default_click_behaviour
...
allow default click behaviour
2013-01-14 11:24:02 -08:00
Sam Tuke
d95fc4e1e3
Adding sharing support: added new method in Keymanager setShareKey()
...
Added notes in proxy{} and stream{} pointing to share support
2013-01-14 19:07:28 +00:00
Sam Tuke
1641ed8ac7
Merge branch 'master' into files_encryption
2013-01-14 16:54:25 +00:00
Sam Tuke
e9f3c5feea
Added creation of dir for shared file env encryption keys
...
Added comment to use multiKeyEncrypt
2013-01-14 15:39:04 +00:00
Thomas Müller
51a4240051
Merge pull request #1170 from owncloud/correctIndention
...
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
Sam Tuke
3fbf362ba2
Removed debugging comments
2013-01-14 12:36:46 +00:00
Björn Schießle
cd802ed45b
Merge branch 'master' of github.com:owncloud/core
2013-01-14 10:33:17 +01:00
Björn Schießle
e0173303e6
merge conflict fixed, settings-personal.php is no longer needed
...
Conflicts:
apps/files_versions/templates/settings-personal.php
2013-01-14 10:24:40 +01:00
Jenkins for ownCloud
c29310aaef
[tx-robot] updated from transifex
2013-01-14 00:18:21 +01:00
Lukas Reschke
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
Lukas Reschke
9cfc195b7c
The => This
...
Sounds better for me.
2013-01-13 00:45:45 +01:00
Lukas Reschke
90d0d08826
Improved the help text
2013-01-13 00:37:58 +01:00
Lukas Reschke
fb7f9e25c3
legend - l10n
2013-01-13 00:32:44 +01:00
Jenkins for ownCloud
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
Björn Schießle
d276d21c76
- code clean-up
...
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
2013-01-11 19:33:54 +01:00
Arthur Schiwon
09c54722a8
add LDAP User and Group proxies to suppoer multiple servers
2013-01-11 18:13:22 +01:00
Thomas Mueller
e560cba76b
adding a ajax call to get the current file storage stats like free space
...
logic to call it every 5 minutes
make use of visibility API/jquery-visibility to perform the ajax call only if the browser is visible/in use
2013-01-11 16:47:28 +01:00
Thomas Mueller
938254a1c0
load jquery-visibility
2013-01-11 16:45:32 +01:00
Thomas Mueller
362860c5b5
adding jquery-visibility
...
https://github.com/mathiasbynens/jquery-visibility
MIT and GPL licensed
2013-01-11 16:44:25 +01:00
Thomas Mueller
3d33e8f845
fixing indent - sorryy wrong setting on the IDE :-(
...
replace missing calls to OC.Notification.show
2013-01-11 15:02:34 +01:00
Thomas Mueller
9afdc14d40
adding accidentally removed line - THX @bartv2
2013-01-11 14:55:49 +01:00
Björn Schießle
99a0ea44ee
function description fixed
2013-01-11 14:24:00 +01:00
Björn Schießle
67d00bc6bb
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
2013-01-11 14:23:28 +01:00
Thomas Mueller
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Björn Schießle
6be9c0a974
some code clean-up
2013-01-11 11:12:32 +01:00
Thomas Mueller
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Thomas Mueller
23896a7290
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 09:53:12 +01:00
Michael Gapczynski
36cac7f924
Return NOT_FOUND in shared cache
2013-01-10 22:29:47 -05:00
Thomas Müller
60489764f3
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
...
add more linebreaks, replace SQL LIMIT with param
2013-01-10 15:14:14 -08:00
Jenkins for ownCloud
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
Arthur Schiwon
fab5817f67
documentation for the Connection constructor
2013-01-10 23:34:24 +01:00
Arthur Schiwon
0784bcb8d7
introduce configPrefix to allow settings for multiple LDAP servers
2013-01-10 23:30:26 +01:00
Sam Tuke
fed74eda1c
Removed old and unnecessary comments
2013-01-10 18:48:40 +00:00
Sam Tuke
2e30641caa
Removed misleading crypto gen comment
2013-01-10 18:19:37 +00:00
Sam Tuke
9ca9124dc1
Merge branch 'master' into files_encryption
2013-01-10 18:07:15 +00:00
Sam Tuke
61104d1441
Re-added 'checkAdminUser'
...
Improved code formatting
2013-01-10 18:04:52 +00:00
Björn Schießle
dca0fda2ad
keep track of the size of the versions directory
2013-01-10 18:04:30 +01:00
Thomas Müller
23dd7f1bea
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
...
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
Björn Schießle
417498d519
add complete size of versions to array
2013-01-10 10:36:55 +01:00
Michael Gapczynski
464dafd7d2
Make Google Drive storage id unique, before it was anonymousanonymous
2013-01-09 22:17:39 -05:00
Michael Gapczynski
fbcf62389c
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/lib/webdav.php
2013-01-09 21:49:21 -05:00
Michael Gapczynski
78043d73e8
Set status to waiting for Dropbox and Google Drive while authenticating
2013-01-09 21:47:24 -05:00
Jenkins for ownCloud
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
Lukas Reschke
fda1ada4f0
Merge pull request #1131 from owncloud/more_translations
...
translate move and rename error messages
2013-01-09 12:07:39 -08:00
Lukas Reschke
ca027f3749
Merge pull request #1124 from schiesbn/sabredav2
...
OC_Connector_Sabre_Client no longer needed
2013-01-09 12:06:25 -08:00
Björn Schießle
d51fba7781
every 1000s run reduce the number of versions for all files, not only for the currently edited file
2013-01-09 17:11:46 +01:00
Jörn Friedrich Dreyer
780fb37758
allow default click behaviour
2013-01-09 15:21:55 +01:00
Jörn Friedrich Dreyer
42e3eaf45a
add more linebreaks, replace SQL LIMIT with param
2013-01-09 13:57:51 +01:00
Jörn Friedrich Dreyer
a40c95242f
more translations
2013-01-09 12:48:57 +01:00
Thomas Mueller
ccdaec6296
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
2013-01-09 00:37:50 +01:00
Jenkins for ownCloud
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f
Merge pull request #938 from owncloud/fix_minor_files_annoyances
...
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Arthur Schiwon
4a8c25eef5
dechex not necessary, do not waste time with it
2013-01-08 19:25:19 +01:00
Arthur Schiwon
19fa78d1ee
Code style
2013-01-08 19:00:49 +01:00
Björn Schießle
43415386a8
Upstream merged my patch to add additional ssl root certificates to the webdav client.
...
This means that OC_Connector_Sabre_Client is no longer needed
2013-01-08 17:44:28 +01:00
Michael Gapczynski
e8b195bf10
Almost fix Shared scanner...
2013-01-07 20:52:51 -05:00
Thomas Mueller
7b9e6d2f2c
fixing string concatenation in javascript
...
refs ae54364d7c
2013-01-08 00:32:41 +01:00
Jenkins for ownCloud
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
Michael Gapczynski
8f8a5bbfb7
Maked Shared_Permissions extend Permissions class
2013-01-07 18:17:14 -05:00
Michael Gapczynski
a7d4d04223
Fix mimetypes in shared cache
2013-01-07 15:27:22 -05:00
Thomas Mueller
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
Frank Karlitschek
861f32a22b
Update apps/user_webdavauth/user_webdavauth.php
...
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
2013-01-07 16:45:03 +01:00
Björn Schießle
a0b0a1d294
adjust timestamp of the file copied from the version history
2013-01-07 15:13:32 +01:00
Jörn Friedrich Dreyer
3bb7ee521f
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
2013-01-07 12:23:29 +01:00
Björn Schießle
619c3ef56d
use limits defined in issue https://github.com/owncloud/core/issues/860
2013-01-07 12:06:31 +01:00
Jörn Friedrich Dreyer
da442b024c
remove aborted uploads
2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer
cbb118d4a3
adapt to isFileNameValid, whitespace cleanup
2013-01-07 10:39:35 +01:00
Robin Appelman
e8d08d4930
merge master into filesystem
2013-01-07 00:16:10 +01:00
Jenkins for ownCloud
0b007235b9
[tx-robot] updated from transifex
2013-01-07 00:06:32 +01:00
Thomas Mueller
7042b5bf1f
remove silly assignment
2013-01-06 23:53:05 +01:00
Thomas Mueller
a0d6f0e127
fixing undefined $eventSource
2013-01-06 23:36:31 +01:00
Thomas Mueller
4a345fd911
removing undefined $response
2013-01-06 23:28:58 +01:00
Thomas Mueller
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
bae1755184
Merge branch 'master' into fixing-784-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
lib/helper.php
2013-01-06 22:40:35 +01:00
Thomas Mueller
07b3b23a39
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:28:21 +01:00
Sam Tuke
a68b597e83
Merge branch 'master' into files_encryption
2013-01-06 18:53:32 +00:00
Sam Tuke
015787fbb3
All in-use unit tests now passing after merge
2013-01-06 18:38:35 +00:00
Sam Tuke
2d98afa1ea
Removed debugging line
2013-01-06 14:06:22 +00:00
Sam Tuke
b024db9f98
Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly
2013-01-06 13:56:45 +00:00
Thomas Mueller
b4191b7da5
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
...
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +01:00
Thomas Mueller
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
Thomas Mueller
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
Sam Tuke
69e86c0213
Merge branch 'master' into files_encryption
2013-01-05 17:22:01 +00:00
Sam Tuke
7fe9245636
Development snapshot
...
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
2013-01-05 17:12:23 +00:00
Robin Appelman
a5dcbc3d8a
Files: prevent people from renaming files to '.'
2013-01-05 03:30:05 +01:00
Michael Gapczynski
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
Jenkins for ownCloud
934d9dcc42
[tx-robot] updated from transifex
2013-01-05 00:03:58 +01:00
Arthur Schiwon
ec1caa7d35
support LDAP search using multiple base DNs also with paged results, implements #395
2013-01-04 23:57:55 +01:00
Thomas Mueller
ba475d4862
javascript notification functions have been moved to js.js for common use
2013-01-04 23:34:09 +01:00
Jörn Friedrich Dreyer
9cd7bb2c8d
reverse z-index of a and input to make upload work again in ie8/9
2013-01-04 13:48:29 +01:00
Jörn Friedrich Dreyer
de496ed16d
remove initial iframe, is added automatically by jquery upload mechanism
2013-01-04 13:47:47 +01:00
Jenkins for ownCloud
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
Arthur Schiwon
81489ad860
support multiple base DNs
2013-01-03 21:38:53 +01:00
Arthur Schiwon
3b82be5e64
Base DNs will be used as array, now, to support usage of multiple DNs
2013-01-03 21:18:21 +01:00
Michael Gapczynski
1137723b2a
Remove unnecessary length parameter from last commit
2013-01-03 12:13:45 -05:00
Michael Gapczynski
38876fc98a
Update old storage classes names to the new namespace during mounting
2013-01-03 12:07:04 -05:00
Michael Gapczynski
f144be8857
Don't mount shared storage unless there are shared files
2013-01-03 11:37:19 -05:00
Robin Appelman
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
Thomas Müller
b673748151
Merge pull request #1063 from owncloud/translate_not_enough_space_available
...
add translation call for 'Not enough space available' upload error
2013-01-03 06:46:36 -08:00
Arthur Schiwon
72d67ec036
Switch to textarea to enable configuration of multiple DNs
2013-01-03 14:07:01 +01:00
Jörn Friedrich Dreyer
fc64e8ec58
fix error when wrong dir was specified
2013-01-03 13:34:56 +01:00
Arthur Schiwon
959996c3b4
LDAP: fix spelling
2013-01-03 12:32:42 +01:00
Jörn Friedrich Dreyer
f19787f84c
move $l to top
2013-01-03 12:00:07 +01:00
Jörn Friedrich Dreyer
ea732e5b29
also translate 'No file was uploaded. Unknown error'
2013-01-03 11:57:17 +01:00
Jenkins for ownCloud
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
Thomas Müller
e0e7c98100
Merge pull request #1041 from owncloud/fixing-856-master
...
Fixing #856 master
2013-01-02 14:58:54 -08:00
Thomas Mueller
3ea9432d43
fixing undefined variable $l
2013-01-02 22:15:43 +01:00
Jörn Friedrich Dreyer
0405edc798
add translation call for 'Not enough space available' upload error
2013-01-02 21:00:50 +01:00
Sam Tuke
665261dc9a
Development snapshot, mocking out Session{} for crypt unit tests
2013-01-02 19:29:22 +00:00
Michael Gapczynski
7f218c4dc0
Remove accidentally included file
2013-01-02 13:20:44 -05:00
Sam Tuke
bf69677933
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files/css/files.css
apps/files/index.php
apps/files/js/files.js
apps/files/js/keyboardshortcuts.js
apps/files/l10n/da.php
apps/files/l10n/el.php
apps/files/l10n/eu.php
apps/files/l10n/hu_HU.php
apps/files/l10n/mk.php
apps/files/l10n/nb_NO.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/gl.php
apps/files_external/l10n/uk.php
apps/files_external/personal.php
apps/files_external/settings.php
apps/files_external/templates/settings.php
apps/files_sharing/public.php
apps/user_ldap/l10n/gl.php
apps/user_ldap/l10n/uk.php
apps/user_ldap/lib/access.php
apps/user_webdavauth/l10n/eo.php
apps/user_webdavauth/l10n/eu.php
apps/user_webdavauth/l10n/fr.php
apps/user_webdavauth/l10n/gl.php
apps/user_webdavauth/l10n/sl.php
apps/user_webdavauth/l10n/tr.php
apps/user_webdavauth/l10n/uk.php
apps/user_webdavauth/l10n/zh_CN.php
core/ajax/share.php
core/css/styles.css
core/l10n/ca.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/eu.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/is.php
core/l10n/it.php
core/l10n/nl.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ru.php
core/l10n/sl.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/zh_CN.php
core/templates/installation.php
core/templates/login.php
l10n/ar/files_external.po
l10n/ar/settings.po
l10n/bg_BG/files_external.po
l10n/bg_BG/settings.po
l10n/ca/core.po
l10n/ca/files_external.po
l10n/ca/settings.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/settings.po
l10n/da/files.po
l10n/da/files_external.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files_external.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files_external.po
l10n/de_DE/settings.po
l10n/el/core.po
l10n/el/files.po
l10n/el/files_external.po
l10n/el/settings.po
l10n/eo/core.po
l10n/eo/files_external.po
l10n/eo/settings.po
l10n/eo/user_webdavauth.po
l10n/es/core.po
l10n/es/files_external.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files_external.po
l10n/es_AR/settings.po
l10n/et_EE/files_external.po
l10n/et_EE/settings.po
l10n/et_EE/user_webdavauth.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/files_external.po
l10n/eu/settings.po
l10n/eu/user_webdavauth.po
l10n/fa/files_external.po
l10n/fa/settings.po
l10n/fi_FI/files_external.po
l10n/fi_FI/settings.po
l10n/fr/core.po
l10n/fr/files_external.po
l10n/fr/settings.po
l10n/fr/user_webdavauth.po
l10n/gl/core.po
l10n/gl/files_external.po
l10n/gl/settings.po
l10n/gl/user_ldap.po
l10n/gl/user_webdavauth.po
l10n/he/core.po
l10n/he/files_external.po
l10n/he/settings.po
l10n/hi/files_external.po
l10n/hi/settings.po
l10n/hr/files_external.po
l10n/hr/settings.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/ia/files_external.po
l10n/ia/settings.po
l10n/id/files_external.po
l10n/id/settings.po
l10n/is/core.po
l10n/is/files.po
l10n/is/files_encryption.po
l10n/is/files_external.po
l10n/is/files_sharing.po
l10n/is/files_versions.po
l10n/is/lib.po
l10n/is/settings.po
l10n/is/user_ldap.po
l10n/is/user_webdavauth.po
l10n/it/core.po
l10n/it/files_external.po
l10n/it/settings.po
l10n/ja_JP/core.po
l10n/ja_JP/files_external.po
l10n/ja_JP/settings.po
l10n/ka_GE/files_external.po
l10n/ka_GE/settings.po
l10n/ko/core.po
l10n/ko/files_external.po
l10n/ko/settings.po
l10n/ko/user_ldap.po
l10n/ko/user_webdavauth.po
l10n/ku_IQ/files_external.po
l10n/ku_IQ/settings.po
l10n/lb/files_external.po
l10n/lb/settings.po
l10n/lt_LT/files_external.po
l10n/lt_LT/settings.po
l10n/lv/files_external.po
l10n/lv/settings.po
l10n/mk/files.po
l10n/mk/files_external.po
l10n/mk/settings.po
l10n/ms_MY/files_external.po
l10n/ms_MY/settings.po
l10n/nb_NO/files.po
l10n/nb_NO/files_external.po
l10n/nb_NO/settings.po
l10n/nl/core.po
l10n/nl/files_external.po
l10n/nl/settings.po
l10n/nn_NO/files_external.po
l10n/nn_NO/settings.po
l10n/oc/files_external.po
l10n/oc/settings.po
l10n/pl/core.po
l10n/pl/files_external.po
l10n/pl/settings.po
l10n/pl_PL/files_external.po
l10n/pl_PL/settings.po
l10n/pt_BR/core.po
l10n/pt_BR/files_external.po
l10n/pt_BR/settings.po
l10n/pt_PT/core.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ro/files_external.po
l10n/ro/settings.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/settings.po
l10n/ru_RU/files.po
l10n/ru_RU/files_external.po
l10n/ru_RU/settings.po
l10n/si_LK/files_external.po
l10n/si_LK/settings.po
l10n/sk_SK/core.po
l10n/sk_SK/files_external.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_webdavauth.po
l10n/sl/core.po
l10n/sl/files_external.po
l10n/sl/settings.po
l10n/sl/user_webdavauth.po
l10n/sq/core.po
l10n/sq/files_external.po
l10n/sq/settings.po
l10n/sq/user_ldap.po
l10n/sq/user_webdavauth.po
l10n/sr/core.po
l10n/sr/files_external.po
l10n/sr/settings.po
l10n/sr@latin/files_external.po
l10n/sr@latin/settings.po
l10n/sv/files_external.po
l10n/sv/settings.po
l10n/ta_LK/files_external.po
l10n/ta_LK/settings.po
l10n/ta_LK/user_ldap.po
l10n/ta_LK/user_webdavauth.po
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
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/files_external.po
l10n/th_TH/settings.po
l10n/th_TH/user_webdavauth.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/files_external.po
l10n/tr/settings.po
l10n/tr/user_webdavauth.po
l10n/uk/core.po
l10n/uk/files_external.po
l10n/uk/settings.po
l10n/uk/user_ldap.po
l10n/uk/user_webdavauth.po
l10n/vi/core.po
l10n/vi/files_external.po
l10n/vi/settings.po
l10n/zh_CN.GB2312/files_external.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/core.po
l10n/zh_CN/files_external.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_webdavauth.po
l10n/zh_HK/core.po
l10n/zh_HK/files_external.po
l10n/zh_HK/settings.po
l10n/zh_HK/user_ldap.po
l10n/zh_HK/user_webdavauth.po
l10n/zh_TW/core.po
l10n/zh_TW/files_external.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
l10n/zh_TW/user_webdavauth.po
l10n/zu_ZA/files_external.po
l10n/zu_ZA/settings.po
lib/base.php
lib/filecache.php
lib/files.php
lib/helper.php
lib/l10n.php
lib/request.php
lib/util.php
settings/ajax/togglegroups.php
settings/js/users.js
settings/l10n/ar.php
settings/l10n/de_DE.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es_AR.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hi.php
settings/l10n/ko.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/ta_LK.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/templates/help.php
2013-01-02 17:14:23 +00:00
Michael Gapczynski
db90f2c296
Listen to checkbox changes as well
2013-01-02 12:13:59 -05:00
Michael Gapczynski
d65cb7ae09
Fix 'Grant Access' button for multiple Google Drive mount points and prevent multiple scripts being added
2013-01-02 11:59:17 -05:00
Jörn Friedrich Dreyer
03b8a065cf
input/form switching cleanup
2013-01-02 17:03:16 +01:00
Jörn Friedrich Dreyer
a6733ff012
abort rename on ESC keyup
2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
740b6623aa
show notification when renaming a file to ''
2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
32c2b0d50e
enable enter in ie by using .submit()+form instead of .change(), use notifications when name is empty
2013-01-02 16:17:30 +01:00
Jörn Friedrich Dreyer
8148c187a3
whitespace cleanup
2013-01-02 16:07:10 +01:00
Thomas Mueller
48f6dccdb7
notifications are now shown/hidden using the js functions hideNotification and showNotification.
...
storage warnings are displayed in a notification.
as soon as a notification is hidden the storage warning will come back.
2013-01-02 15:09:40 +01:00
Thomas Mueller
48c7bed59b
make usedSpacePercent available in the files app
2013-01-02 15:06:49 +01:00
Jenkins for ownCloud
516464ba94
[tx-robot] updated from transifex
2013-01-02 00:05:14 +01:00
Michael Gapczynski
a69de3a8f1
Turn off async for saving mount points, improve input detection for Google and Dropbox 'Grant Access' buttons
2013-01-01 16:19:40 -05:00
Michael Gapczynski
a1f7c28e28
Use the source Scanner for shared storage when the path is specified
2013-01-01 14:47:25 -05:00
Michael Gapczynski
fe90130618
Initialize storageId variable in shared cache
2013-01-01 14:24:18 -05:00
Michael Gapczynski
268c7acfc4
Actually add Shared_Watcher
2013-01-01 13:16:42 -05:00
Michael Gapczynski
3b67613afc
Remove Shared_Scanner and add Shared_Watcher instead
2013-01-01 12:43:38 -05:00
Robin Appelman
0ac78a6411
Share: fix cache put function
2013-01-01 18:10:38 +01:00
Robin Appelman
4b65dd608a
Share: small phpdoc fixes
2013-01-01 18:07:10 +01:00
Michael Gapczynski
f2ca7023e1
Fix Shared root problems with Watcher and Quota proxy
2013-01-01 11:19:33 -05:00
Jenkins for ownCloud
c6064a542c
[tx-robot] updated from transifex
2013-01-01 00:04:42 +01:00
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
d275725e23
No longer need to create folders locally for external storage mount points
2012-12-29 13:43:44 -05:00
Michael Gapczynski
cfc3526b25
Fix data for shared root folder
2012-12-29 11:45:13 -05:00
Michael Gapczynski
fb053f8e73
Fix retrieving of shared source paths
2012-12-29 11:09:57 -05: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
Michael Gapczynski
442a045ef6
Fix problems with chosen multiselect
2012-12-28 17:38:24 -05:00
hkjolhede
ab4d52e980
Update apps/files_external/lib/sftp.php
...
Created test() function as per @pull/1031
2012-12-28 22:22:04 +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
Michael Gapczynski
595e72ade8
Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ownCloud / WebDAV
2012-12-28 15:56:48 -05:00
Michael Gapczynski
8bdfb04056
Fix shared folders
2012-12-28 15:06:12 -05:00
Michael Gapczynski
ad902a9848
Move storage backend tests from constructor to test function
2012-12-28 12:00:48 -05:00
Jenkins for ownCloud
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
hkjolhede
ab31c3ef4e
Update apps/files_external/lib/sftp.php
...
Updated to using local 3rdparty + added a few missed braces.
2012-12-27 21:00:20 +01:00
Henrik Kjölhede
8598d18529
Added phpseclib to files_external as 3rdparty
2012-12-27 20:23:56 +01:00
hkjolhede
be197d52b1
Update apps/files_external/lib/sftp.php
...
Added copyright notice
2012-12-27 19:47:46 +01:00
Jenkins for ownCloud
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
hkjolhede
00bfcd94ec
Update apps/files_external/lib/sftp.php
...
Added a little better exception handling, hopefully making it a little more robust
2012-12-26 23:49:53 +01:00
hkjolhede
3375253e1d
Update apps/files_external/lib/sftp.php
...
Added checks for host keys and added exceptions thrown if constructor fails.
2012-12-26 23:38:17 +01:00
Michael Gapczynski
1910057900
Fix shared statuses inside folders
2012-12-26 16:20:10 -05:00
Michael Gapczynski
d9ff3b6860
Fix last commit's variable
2012-12-26 14:18:51 -05:00
Michael Gapczynski
48a3966ea9
Listen to paste events for dropbox configuration
2012-12-26 14:04:02 -05:00
Michael Gapczynski
5d68e04e5a
Change callback url for dropbox as well
2012-12-26 13:45:22 -05:00
Michael Gapczynski
30a07e9573
Save configuration after paste events and 2 seconds after typing
2012-12-26 13:35:22 -05:00
hkjolhede
6aded84f10
Update apps/files_external/lib/config.php
...
Adding support for SFTP mounts
2012-12-26 18:03:16 +01:00
hkjolhede
180ab42c06
Update apps/files_external/appinfo/app.php
...
Adding support for SFTP
2012-12-26 18:00:04 +01:00
hkjolhede
08156cc57f
Create sftp.php
...
Adapter for SFTP using the pure php SSH library phpseclib
2012-12-26 08:59:08 -08:00
Jenkins for ownCloud
b7257b2524
[tx-robot] updated from transifex
2012-12-26 00:12:10 +01: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
Michael Gapczynski
a0e47a2c67
Prevent javascript error if no value is set for the multiselect
2012-12-24 13:55:37 -05:00
Michael Gapczynski
3c08d2ba23
Change callback url to path only in case oauth parameters are still in url
2012-12-24 13:48:18 -05:00
Michael Gapczynski
0dbf1d0260
Show status icons for mount points in external storage UI
2012-12-24 13:45:52 -05: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
Jan-Christoph Borchardt
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +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
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
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
Sam Tuke
063f225a26
Merge branch 'master' into files_encryption
...
Encryption unit tests still failing, needs work
Conflicts:
3rdparty/Archive/Tar.php
3rdparty/MDB2/Driver/Datatype/Common.php
3rdparty/MDB2/Driver/mysql.php
3rdparty/Sabre/CalDAV/CalendarQueryValidator.php
3rdparty/Sabre/CalDAV/Plugin.php
3rdparty/Sabre/CalDAV/Version.php
3rdparty/Sabre/CardDAV/AddressBook.php
3rdparty/Sabre/CardDAV/AddressBookQueryParser.php
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/Sabre/CardDAV/Version.php
3rdparty/Sabre/DAV/Client.php
3rdparty/Sabre/DAV/Locks/Plugin.php
3rdparty/Sabre/DAV/Server.php
3rdparty/Sabre/DAV/Tree/Filesystem.php
3rdparty/Sabre/DAV/Version.php
3rdparty/Sabre/HTTP/BasicAuth.php
3rdparty/Sabre/HTTP/Version.php
3rdparty/Sabre/VObject/Component/VEvent.php
3rdparty/Sabre/VObject/DateTimeParser.php
3rdparty/Sabre/VObject/RecurrenceIterator.php
3rdparty/Sabre/VObject/Version.php
3rdparty/class.phpmailer.php
3rdparty/class.smtp.php
3rdparty/css/chosen-sprite.png
3rdparty/css/chosen.css
3rdparty/css/chosen/chosen.css
3rdparty/fullcalendar/css/fullcalendar.css
3rdparty/fullcalendar/css/fullcalendar.print.css
3rdparty/fullcalendar/js/fullcalendar.js
3rdparty/fullcalendar/js/fullcalendar.min.js
3rdparty/fullcalendar/js/gcal.js
3rdparty/js/chosen/VERSION
3rdparty/js/chosen/chosen.jquery.js
3rdparty/js/chosen/chosen.jquery.min.js
3rdparty/openid/class.openid.v3.php
3rdparty/openid/phpmyid.php
3rdparty/php-cloudfiles/cloudfiles.php
3rdparty/smb4php/smb.php
3rdparty/timepicker/css/jquery.ui.timepicker.css
3rdparty/timepicker/js/i18n/i18n.html
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-de.js
3rdparty/timepicker/js/i18n/jquery.ui.timepicker-ja.js
3rdparty/timepicker/js/jquery.ui.timepicker.js
3rdparty/timepicker/releases.txt
README
apps/files/admin.php
apps/files/ajax/autocomplete.php
apps/files/ajax/move.php
apps/files/ajax/newfile.php
apps/files/ajax/scan.php
apps/files/ajax/timezone.php
apps/files/ajax/upload.php
apps/files/appinfo/filesync.php
apps/files/appinfo/update.php
apps/files/css/files.css
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/es_AR.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/lv.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/oc.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/ru_RU.php
apps/files/l10n/si_LK.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files/l10n/zh_CN.GB2312.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files/templates/admin.php
apps/files/templates/index.php
apps/files/templates/part.breadcrumb.php
apps/files/templates/part.list.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/appinfo/info.xml
apps/files_encryption/js/settings.js
apps/files_encryption/l10n/fa.php
apps/files_encryption/l10n/sl.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/settings.php
apps/files_encryption/templates/settings.php
apps/files_encryption/tests/encryption.php
apps/files_encryption/tests/proxy.php
apps/files_encryption/tests/stream.php
apps/files_external/l10n/cs_CZ.php
apps/files_external/l10n/et_EE.php
apps/files_external/l10n/lt_LT.php
apps/files_external/l10n/nl.php
apps/files_external/l10n/ru.php
apps/files_external/l10n/sk_SK.php
apps/files_external/l10n/sl.php
apps/files_external/l10n/vi.php
apps/files_external/lib/config.php
apps/files_external/lib/ftp.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
apps/files_external/tests/ftp.php
apps/files_sharing/appinfo/update.php
apps/files_sharing/css/public.css
apps/files_sharing/js/share.js
apps/files_sharing/l10n/de.php
apps/files_sharing/l10n/et_EE.php
apps/files_sharing/l10n/ja_JP.php
apps/files_sharing/l10n/nb_NO.php
apps/files_sharing/l10n/ru.php
apps/files_sharing/l10n/sl.php
apps/files_sharing/l10n/vi.php
apps/files_sharing/lib/share/file.php
apps/files_sharing/lib/share/folder.php
apps/files_sharing/lib/sharedstorage.php
apps/files_sharing/public.php
apps/files_sharing/templates/public.php
apps/files_versions/l10n/et_EE.php
apps/files_versions/l10n/lt_LT.php
apps/files_versions/l10n/nb_NO.php
apps/files_versions/l10n/nl.php
apps/files_versions/l10n/ru.php
apps/files_versions/l10n/sl.php
apps/files_versions/l10n/vi.php
apps/files_versions/lib/hooks.php
apps/files_versions/lib/versions.php
apps/user_ldap/appinfo/database.xml
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/l10n/da.php
apps/user_ldap/l10n/et_EE.php
apps/user_ldap/l10n/pt_PT.php
apps/user_ldap/l10n/sl.php
apps/user_ldap/l10n/vi.php
apps/user_ldap/l10n/zh_CN.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/connection.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/tests/group_ldap.php
apps/user_ldap/user_ldap.php
apps/user_webdavauth/appinfo/app.php
apps/user_webdavauth/appinfo/info.xml
apps/user_webdavauth/settings.php
apps/user_webdavauth/templates/settings.php
apps/user_webdavauth/user_webdavauth.php
autotest.sh
core/ajax/appconfig.php
core/ajax/share.php
core/ajax/translations.php
core/ajax/vcategories/add.php
core/ajax/vcategories/delete.php
core/ajax/vcategories/edit.php
core/css/share.css
core/js/eventsource.js
core/js/js.js
core/js/oc-vcategories.js
core/js/share.js
core/l10n/ar.php
core/l10n/bg_BG.php
core/l10n/ca.php
core/l10n/cs_CZ.php
core/l10n/da.php
core/l10n/de.php
core/l10n/el.php
core/l10n/eo.php
core/l10n/es.php
core/l10n/es_AR.php
core/l10n/et_EE.php
core/l10n/eu.php
core/l10n/fa.php
core/l10n/fi_FI.php
core/l10n/fr.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hi.php
core/l10n/hr.php
core/l10n/hu_HU.php
core/l10n/ia.php
core/l10n/id.php
core/l10n/it.php
core/l10n/ja_JP.php
core/l10n/ko.php
core/l10n/ku_IQ.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/lv.php
core/l10n/mk.php
core/l10n/ms_MY.php
core/l10n/nb_NO.php
core/l10n/nl.php
core/l10n/nn_NO.php
core/l10n/oc.php
core/l10n/pl.php
core/l10n/pt_BR.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/ru_RU.php
core/l10n/si_LK.php
core/l10n/sk_SK.php
core/l10n/sl.php
core/l10n/sr.php
core/l10n/sr@latin.php
core/l10n/sv.php
core/l10n/th_TH.php
core/l10n/tr.php
core/l10n/uk.php
core/l10n/vi.php
core/l10n/zh_CN.GB2312.php
core/l10n/zh_CN.php
core/l10n/zh_TW.php
core/lostpassword/index.php
core/lostpassword/resetpassword.php
core/templates/layout.base.php
core/templates/layout.guest.php
core/templates/layout.user.php
cron.php
db_structure.xml
files/webdav.php
index.php
l10n/.tx/config
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/files_encryption.po
l10n/ar/lib.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/ar_SA/core.po
l10n/ar_SA/files.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/lib.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/lib.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/files_external.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/lib.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/lib.po
l10n/da/settings.po
l10n/da/user_ldap.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_sharing.po
l10n/de/gallery.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de_DE/core.po
l10n/de_DE/files.po
l10n/de_DE/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/lib.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/lib.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/core.po
l10n/es_AR/files.po
l10n/es_AR/lib.po
l10n/es_AR/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/files_external.po
l10n/et_EE/files_sharing.po
l10n/et_EE/files_versions.po
l10n/et_EE/lib.po
l10n/et_EE/settings.po
l10n/et_EE/user_ldap.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/lib.po
l10n/eu/settings.po
l10n/eu_ES/core.po
l10n/eu_ES/files.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/files_encryption.po
l10n/fa/lib.po
l10n/fa/settings.po
l10n/fi/core.po
l10n/fi/files.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/lib.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/lib.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/lib.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/lib.po
l10n/he/settings.po
l10n/hi/core.po
l10n/hi/files.po
l10n/hi/lib.po
l10n/hi/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/lib.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/lib.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/lib.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/files_encryption.po
l10n/id/files_external.po
l10n/id/files_sharing.po
l10n/id/files_versions.po
l10n/id/lib.po
l10n/id/settings.po
l10n/id/user_ldap.po
l10n/id_ID/core.po
l10n/id_ID/files.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/lib.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/files_sharing.po
l10n/ja_JP/lib.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/lib.po
l10n/ko/settings.po
l10n/ku_IQ/core.po
l10n/ku_IQ/files.po
l10n/ku_IQ/lib.po
l10n/ku_IQ/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/lib.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/files_external.po
l10n/lt_LT/files_versions.po
l10n/lt_LT/lib.po
l10n/lt_LT/settings.po
l10n/lv/core.po
l10n/lv/files.po
l10n/lv/lib.po
l10n/lv/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/lib.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/lib.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/files_sharing.po
l10n/nb_NO/files_versions.po
l10n/nb_NO/gallery.po
l10n/nb_NO/lib.po
l10n/nb_NO/settings.po
l10n/nb_NO/user_ldap.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/files_external.po
l10n/nl/files_versions.po
l10n/nl/gallery.po
l10n/nl/lib.po
l10n/nl/settings.po
l10n/nl/user_ldap.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/lib.po
l10n/nn_NO/settings.po
l10n/oc/core.po
l10n/oc/files.po
l10n/oc/lib.po
l10n/oc/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/lib.po
l10n/pl/settings.po
l10n/pl_PL/core.po
l10n/pl_PL/files.po
l10n/pl_PL/lib.po
l10n/pl_PL/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/lib.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/lib.po
l10n/pt_PT/settings.po
l10n/pt_PT/user_ldap.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/lib.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/files_external.po
l10n/ru/files_sharing.po
l10n/ru/files_versions.po
l10n/ru/gallery.po
l10n/ru/lib.po
l10n/ru/settings.po
l10n/ru_RU/core.po
l10n/ru_RU/files.po
l10n/ru_RU/lib.po
l10n/ru_RU/settings.po
l10n/si_LK/core.po
l10n/si_LK/files.po
l10n/si_LK/files_encryption.po
l10n/si_LK/files_external.po
l10n/si_LK/files_sharing.po
l10n/si_LK/files_versions.po
l10n/si_LK/lib.po
l10n/si_LK/settings.po
l10n/si_LK/user_ldap.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/files_external.po
l10n/sk_SK/lib.po
l10n/sk_SK/settings.po
l10n/sk_SK/user_ldap.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/files_encryption.po
l10n/sl/files_external.po
l10n/sl/files_sharing.po
l10n/sl/files_versions.po
l10n/sl/gallery.po
l10n/sl/lib.po
l10n/sl/settings.po
l10n/sl/user_ldap.po
l10n/so/core.po
l10n/so/files.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/lib.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/lib.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/lib.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/ta_LK/core.po
l10n/ta_LK/files.po
l10n/ta_LK/lib.po
l10n/ta_LK/settings.po
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/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/lib.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/files_encryption.po
l10n/uk/files_versions.po
l10n/uk/lib.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/vi/files_sharing.po
l10n/vi/files_versions.po
l10n/vi/lib.po
l10n/vi/settings.po
l10n/vi/user_ldap.po
l10n/zh_CN.GB2312/core.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN.GB2312/lib.po
l10n/zh_CN.GB2312/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/files_external.po
l10n/zh_CN/gallery.po
l10n/zh_CN/lib.po
l10n/zh_CN/settings.po
l10n/zh_CN/user_ldap.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/lib.po
l10n/zh_TW/settings.po
lib/MDB2/Driver/sqlite3.php
lib/app.php
lib/appconfig.php
lib/archive.php
lib/archive/tar.php
lib/archive/zip.php
lib/base.php
lib/connector/sabre/auth.php
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/eventsource.php
lib/filecache.php
lib/filecache/cached.php
lib/filecache/update.php
lib/filechunking.php
lib/fileproxy.php
lib/fileproxy/fileoperations.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage.php
lib/filestorage/common.php
lib/filestorage/commontest.php
lib/filestorage/local.php
lib/filesystem.php
lib/filesystemview.php
lib/group.php
lib/group/dummy.php
lib/group/example.php
lib/helper.php
lib/image.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/l10n/ca.php
lib/l10n/cs_CZ.php
lib/l10n/da.php
lib/l10n/de.php
lib/l10n/el.php
lib/l10n/eo.php
lib/l10n/es.php
lib/l10n/es_AR.php
lib/l10n/et_EE.php
lib/l10n/eu.php
lib/l10n/fa.php
lib/l10n/fi_FI.php
lib/l10n/fr.php
lib/l10n/gl.php
lib/l10n/he.php
lib/l10n/hu_HU.php
lib/l10n/it.php
lib/l10n/ja_JP.php
lib/l10n/lt_LT.php
lib/l10n/nb_NO.php
lib/l10n/nl.php
lib/l10n/oc.php
lib/l10n/pl.php
lib/l10n/pt_BR.php
lib/l10n/pt_PT.php
lib/l10n/ro.php
lib/l10n/ru.php
lib/l10n/ru_RU.php
lib/l10n/sk_SK.php
lib/l10n/sl.php
lib/l10n/sv.php
lib/l10n/th_TH.php
lib/l10n/uk.php
lib/l10n/vi.php
lib/l10n/zh_CN.GB2312.php
lib/l10n/zh_CN.php
lib/l10n/zh_TW.php
lib/log.php
lib/log/owncloud.php
lib/mail.php
lib/migrate.php
lib/migration/content.php
lib/minimizer.php
lib/ocs.php
lib/ocsclient.php
lib/preferences.php
lib/public/backgroundjob.php
lib/public/db.php
lib/public/share.php
lib/public/util.php
lib/request.php
lib/search.php
lib/search/provider/file.php
lib/search/result.php
lib/setup.php
lib/streamwrappers.php
lib/template.php
lib/templatelayout.php
lib/updater.php
lib/user.php
lib/user/database.php
lib/user/http.php
lib/util.php
lib/vcategories.php
lib/vobject.php
public.php
remote.php
search/ajax/search.php
settings/admin.php
settings/ajax/apps/ocs.php
settings/ajax/changepassword.php
settings/ajax/creategroup.php
settings/ajax/createuser.php
settings/ajax/disableapp.php
settings/ajax/enableapp.php
settings/ajax/getlog.php
settings/ajax/lostpassword.php
settings/ajax/openid.php
settings/ajax/removegroup.php
settings/ajax/removeuser.php
settings/ajax/setlanguage.php
settings/ajax/setloglevel.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/ajax/togglesubadmins.php
settings/ajax/userlist.php
settings/apps.php
settings/css/settings.css
settings/help.php
settings/js/apps.js
settings/js/users.js
settings/l10n/ar.php
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/es_AR.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/id.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lb.php
settings/l10n/lt_LT.php
settings/l10n/lv.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/oc.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ro.php
settings/l10n/ru.php
settings/l10n/ru_RU.php
settings/l10n/si_LK.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sr.php
settings/l10n/sr@latin.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/uk.php
settings/l10n/vi.php
settings/l10n/zh_CN.GB2312.php
settings/l10n/zh_CN.php
settings/l10n/zh_TW.php
settings/personal.php
settings/settings.php
settings/templates/admin.php
settings/templates/apps.php
settings/templates/help.php
settings/templates/personal.php
settings/templates/users.php
settings/trans.png
settings/users.php
tests/bootstrap.php
tests/data/db_structure.xml
tests/lib/archive.php
tests/lib/cache.php
tests/lib/cache/apc.php
tests/lib/cache/xcache.php
tests/lib/db.php
tests/lib/filesystem.php
tests/lib/geo.php
tests/lib/share/share.php
tests/lib/streamwrappers.php
tests/lib/util.php
tests/phpunit.xml
2012-12-12 17:39:43 +00: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
Robin Appelman
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
Sam Tuke
398b52e4f0
Improved formatting of getPublicKeys()
2012-12-11 17:24:25 +00:00
Sam Tuke
453fd66c70
Changing user login pwd now correctly changes encryption key passphrase
...
All crypt unit tests are now passing
2012-12-11 17:12:46 +00: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
Sam Tuke
1fc5b1d02d
Replaced phpseclib calls with symmetric re-encryption of user private key
2012-12-11 15:15:30 +00:00
Sam Tuke
a00dd2d5d6
Revert "Revert "Development snapshot""
...
This reverts commit b66d38ecae
.
2012-12-11 15:10:56 +00:00
Sam Tuke
b66d38ecae
Revert "Development snapshot"
...
This reverts commit c56fb905d1
.
2012-12-11 15:10:39 +00:00
Sam Tuke
aabef796a0
Added library phpseclib
...
First implementation of passphrase changing on user pwd change
2012-12-11 13:22:46 +00: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
Robin Appelman
98f42d314c
merge master into filesystem
2012-12-06 17:47:28 +01:00
Björn Schießle
bf0f39f5b4
make sure that all expected array keys are available
2012-12-06 15:57:53 +01:00
Sam Tuke
c56fb905d1
Development snapshot
...
Read/write interoperability working through web UI and WebDAV
New class Session for handling session data
A few new unit tests
Some additional unit tests are now failing, esp. legacy enc related ones
2012-12-05 18:57:44 +00: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
Sam Tuke
bc3550b37b
Development Snapshot
...
Opening short files via webdav, that were saved via webdav, now works
2012-12-04 19:53:13 +00: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
Robin Appelman
be30b1a8de
merge master into filesystem
2012-12-03 18:02:22 +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
Thomas Mueller
18663100d9
fixing syntax error + reformat the code
2012-12-02 12:12:20 +01:00
Robin Appelman
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01: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
Robin Appelman
dbbb357f62
add upgrade path from old cache to preserve file id's
2012-11-30 01:41:30 +01:00
Erik Sargent
6060d063a9
Cleanup
2012-11-29 16:52:41 -07:00
Robin Appelman
d33f697a5f
merge master into filesystem
2012-11-30 00:18:42 +01: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
Sam Tuke
bfd47cd2df
Development snapshot
...
Moved legacy crypto methods from Util into Crypt
Added preliminary support for reading legacy encrypted files
Added some unit tests
2012-11-28 18:39:19 +00: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
03fd43a239
Merge branch 'master' into filesystem
2012-11-25 15:38:17 +01:00
Robin Appelman
eaf8399aaf
make sure the output buffer is closed when handeling webdav
2012-11-25 14:45:13 +01:00
Jenkins for ownCloud
1857d5f914
[tx-robot] updated from transifex
2012-11-25 00:03:37 +01:00
Michael Gapczynski
c47bf9bbce
Add checks for storage object
2012-11-24 16:42:54 -05:00
Jenkins for ownCloud
dde3342398
[tx-robot] updated from transifex
2012-11-24 00:03:00 +01:00
Robin Appelman
555dec2d92
merge master into filesystem
2012-11-23 16:20:56 +01:00
Jörn Friedrich Dreyer
995b5c0739
readd fallback code for pre token links
2012-11-23 15:51:57 +01:00
Thomas Müller
db2be74b4d
Merge pull request #479 from owncloud/fix_438
...
Do the url encoding once, only in breadcrumbs template
2012-11-23 03:07:02 -08:00
Thomas Müller
b5b7a67f8a
Merge pull request #480 from owncloud/fix_435_and_437
...
Also reject names with \ in the name
2012-11-23 03:05:52 -08:00
Thomas Müller
97ed467224
Merge pull request #418 from libasys/Fix-IE8-fileactions-binding
...
Fixes two issues if you using IE8. IE8 has problems with .bind actions a...
2012-11-23 02:16:21 -08:00
Robin Appelman
95057e727d
merge master into filesystem
2012-11-23 00:40:58 +01:00
Robin Appelman
8fb4dfd2ea
use background scanner
2012-11-23 00:20:46 +01:00
Jenkins for ownCloud
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
Sam Tuke
a465b3cb63
Development snapshot
2012-11-22 20:19:03 +00:00
Sam Tuke
5f78f9d642
Development snapshot
2012-11-22 19:36:48 +00:00
Sam Tuke
13d93fb416
Development snapshot
2012-11-22 14:08:19 +00:00
Jörn Friedrich Dreyer
a81d7cd79f
introduce Files.containsInvalidCharacters(), use when creating or renaming files
2012-11-22 13:03:17 +01:00
Thomas Müller
c773d071ee
Merge pull request #506 from owncloud/fix_505
...
refs #505 - defining publicListView based on template parameter
2012-11-22 02:53:10 -08:00
Thomas Mueller
cd495bf9ba
some more invalid characters have been added
2012-11-22 11:52:05 +01:00
Bart Visscher
1793e85a52
Also reject names with \ in the name
...
fixes issues #435 and #437
2012-11-22 11:52:05 +01:00
blizzz
d4ec77e08b
Merge pull request #482 from eMerzh/fix_prevent_shared_folder
...
Show error message to prevent adding a shared folder in the root dir fix...
2012-11-22 02:40:23 -08:00
Jenkins for ownCloud
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
Robin Appelman
97380f3485
merge master into filesystem
2012-11-21 22:37:14 +01:00
Arthur Schiwon
495a8da354
port 95cee0e
from stable45
2012-11-21 19:29:56 +01:00
Arthur Schiwon
aebd4fd32d
port dd694b5
from stable45
2012-11-21 19:28:29 +01:00
Arthur Schiwon
42f235123e
LDAP: Make update script escape all known DNs. Requires version bump.
2012-11-21 19:25:36 +01:00
Arthur Schiwon
24e13419a3
LDAP: escape values in the DN, fixes #419
2012-11-21 19:25:10 +01:00
Jenkins for ownCloud
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
Sam Tuke
5328aae8a8
Added unit tests for legacy encryption methods
...
Improvements to documentation
2012-11-20 19:10:10 +00:00
Jörn Friedrich Dreyer
d8a171df26
implement share via link token
2012-11-20 15:03:12 +01:00
Frank Karlitschek
9b7cbb1145
interpret http 403 and http 401 as not authorized
2012-11-20 13:44:49 +01:00
Jenkins for ownCloud
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
Robin Appelman
a922eb756e
merge master into filesystem
2012-11-18 14:07:52 +01:00
Thomas Mueller
2af7ac78d2
refs #505 - defining publicListView based on template parameter
2012-11-18 12:28:04 +01:00
Jenkins for ownCloud
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
Jenkins for ownCloud
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
Sam Tuke
637891b771
Development snapshot, lots of fixes
...
Web UI based encryption working
Crypt and Util unit tests passing
2012-11-16 18:31:37 +00:00
Sam Tuke
6df35eeddc
Added unit tests for setupServerSide(), key paths, and ready()
...
Started using Mockery library for mimicking objects
2012-11-16 18:30:00 +00:00
Bart Visscher
20c24f234f
Do the url encoding once, only in breadcrumbs template
...
fixes issue #438
2012-11-16 16:12:28 +01:00
Brice Maron
02bc440900
Show error message to prevent adding a shared folder in the root dir fix #468
2012-11-16 14:59:14 +00:00
Robin Appelman
3358bface5
fix incorectly merged versions.php
2012-11-16 12:24:28 +01:00
Robin Appelman
54240140b1
fix incorectly merged smb.php
2012-11-16 12:14:29 +01:00
Thomas Mueller
4a3b5125cf
adding comments on the form array indexes
2012-11-16 11:58:33 +01:00
Thomas Mueller
2b192a75c4
normalize the path once in upload.php is enough - THX Robin for this hint
2012-11-16 11:50:57 +01:00
Thomas Mueller
7af4cf48c9
refs #461 - drag'n'drop upload to a sub folder is working now
2012-11-16 10:23:40 +01:00
Robin Appelman
f94d62380f
Merge branch 'master' into filesystem
2012-11-15 21:27:24 +01:00
Björn Schießle
8a93cc14f6
port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.'
2012-11-15 17:16:18 +01:00
Sam Tuke
b5c0e4042e
Fixing use of splitIv
...
Fixed unit tests for splitIv
2012-11-15 13:01:05 +00:00
Sam Tuke
138a255f73
Switched require() for require_once()
2012-11-15 13:01:04 +00:00
Sam Tuke
cb81b82a11
Fixed IV generation test
...
Changed use of namespace
2012-11-15 11:54:16 +00:00
Sam Tuke
886fb188cd
Improved documentation
...
Implemented exceptions
Added method for splitting catfiles
2012-11-15 11:54:16 +00:00
Sam Tuke
459a7622dc
Added check if sharing app is enabled, commented out sharing code due to issue
2012-11-15 11:54:16 +00:00
Robin Appelman
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
Jenkins for ownCloud
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
Sam Tuke
fdf0f6ce61
Added namespace
2012-11-14 16:39:35 +00:00
libasys
eda9ce4cf8
Fixes two issues if you using IE8. IE8 has problems with .bind actions and since jquery 1.7.2 using .bind is old school style for event delegation. the new and better way is using .on() function. The second is using $.each instead of for() to walkthrough an array! Now it works perfect, the events after uploads are triggered.
2012-11-14 16:05:24 +01:00
Sam Tuke
dd987a8bd1
Added minor documentation
2012-11-14 13:58:57 +00:00
Jenkins for ownCloud
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
Jenkins for ownCloud
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
icewind1991
66dfe270c6
Merge pull request #319 from owncloud/fileactions_newfile
...
Add fileactions to new files and folders
2012-11-12 14:57:06 -08:00
Arthur Schiwon
d79e9a2da7
LDAP: cherrypick objectGUID handling from stable45, was part of PR 344
2012-11-12 17:00:23 +01:00
Jörn Friedrich Dreyer
bbef5b377e
add i18n for cancel button
2012-11-12 10:52:28 +01:00
Jenkins for ownCloud
09d6d843f7
[tx-robot] updated from transifex
2012-11-12 00:02:24 +01:00
Thomas Tanghus
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
Jenkins for ownCloud
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
Diederik de Haas
6e6df6e410
Fixed new checkstyle issues in ftp.php from build #1341 .
2012-11-10 00:46:50 +01:00
Diederik de Haas
3cc6df489f
Fixed new checkstyle issues in swift.php from build #1341 .
2012-11-10 00:45:49 +01:00
Diederik de Haas
051635412d
Fixed new checkstyle issues from build #1341 .
2012-11-10 00:40:32 +01:00
Jenkins for ownCloud
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
Jenkins for ownCloud
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
Thomas Mueller
127a5a3ecd
l10n support for user_webdavauth
2012-11-09 09:59:27 +01:00
Jenkins for ownCloud
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
Robin Appelman
41a61bc637
fix undefined index when loading files app
2012-11-08 21:36:13 +01:00
Robin Appelman
d4858527c2
fix rename parameter order
2012-11-08 21:35:30 +01:00
Georg Ehrke
84084b9430
Merge pull request #261 from owncloud/fix_opera_file_delete
...
fix file delete in opera - fixes #188
2012-11-08 08:55:19 -08:00
Robin Appelman
091ff02362
merge master into filesystem
2012-11-08 17:32:00 +01:00
Jenkins for ownCloud
c8f24fa3c9
[tx-robot] updated from transifex
2012-11-08 00:03:43 +01:00
Robin Appelman
37fe9800b6
add actions to newly created files and folders
...
closes #231
2012-11-07 22:13:52 +01:00
Robin Appelman
42935c5564
reuse jquery object when adding files to the file list
2012-11-07 22:06:05 +01:00
Robin Appelman
e14054610f
Revert "fix blocking drag & drop upload of folders"
...
Fixes #150
This reverts commit 5b2f3c7f72
.
2012-11-07 21:59:18 +01:00
Robin Appelman
961ff01a93
merge master into filesystem
2012-11-07 17:18:56 +01:00
Björn Schießle
1910bff75c
Merge pull request #303 from owncloud/fix_issue_95
...
urlencode file/dir to allow special characters in filename/path (issue #95 )
2012-11-07 05:48:28 -08:00
Björn Schießle
7b51a4e5f9
Merge pull request #306 from owncloud/crumb_drop_fix
...
extract the right file name for drag&drop.
2012-11-07 05:46:18 -08:00
Björn Schießle
168a2c7b6b
get the right file name for drag&drop. This was necessary after the switch to css to show/hide file actions, otherwise the actions where part of the extracted file name.
2012-11-07 14:10:10 +01:00
Thomas Müller
d42d88d391
Merge pull request #289 from zimba12/master
...
Move function that relativizes dates from Files app to core
2012-11-07 03:43:59 -08:00
Björn Schießle
12983cf0b0
urlencode file/dir to allow special characters in filename/path (issue #95 )
2012-11-07 10:47:19 +01:00
Jenkins for ownCloud
3e01fe1dbb
[tx-robot] updated from transifex
2012-11-07 00:02:51 +01:00
Arthur Schiwon
6339e71bdc
LDAP: fix typo in config value handling.
2012-11-06 20:16:37 +01:00
Alessandro Cosentino
50dbb30eb9
Moved relative_modified_date from file/js to core/js
2012-11-06 10:56:42 -05:00
blizzz
64ac208fb2
Merge pull request #258 from wardragon/ldap_existence_check_no_refactor
...
LDAP: improved object existence check
2012-11-06 07:24:15 -08:00
Jenkins for ownCloud
4d052c1eee
[tx-robot] updated from transifex
2012-11-06 00:01:40 +01:00
Thomas Müller
b7e9d8d00e
Merge pull request #267 from owncloud/improve_files_update
...
Improve performance of files update (on larger setups)
2012-11-05 14:06:07 -08:00
Arthur Schiwon
8b3ae4309b
Fix mkdir and opendir warnings when path does not exist
2012-11-05 21:37:59 +01:00
Arthur Schiwon
85d6a08ae9
prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups
2012-11-05 20:47:26 +01:00
Georg Ehrke
bb0164c9fc
fix file delete in opera - fixes #188
2012-11-05 18:42:44 +01:00
Lorenzo M. Catucci
ca24f4767b
Return an empty array on succesful existence check
2012-11-05 17:35:09 +01:00
Robin Appelman
972243d564
support string values ('true' and 'false') for configuring the secure parameter on external storage backends
...
fixes #78
2012-11-05 16:39:03 +01:00
Lorenzo M. Catucci
510191db68
Return true or false from readAttribute if $attr is empty
...
This way, readAttribute can act as an existence checker.
2012-11-05 15:38:49 +01:00
Thomas Müller
5c72d28ffd
Merge pull request #245 from owncloud/fileactions
...
some more reuse for fileactions
2012-11-05 05:52:52 -08:00
Frank Karlitschek
59381b90a0
Merge pull request #252 from owncloud/fix_user_webdavauth
...
Fix user webdavauth
2012-11-05 05:38:06 -08:00
Frank Karlitschek
6fba4ba87d
fix the webdavauth app
2012-11-05 14:22:16 +01:00
Robin Appelman
34fee8afaa
remove debug statements
2012-11-05 13:52:02 +01:00
Frank Karlitschek
01b0e9b133
fix the webdav user backend. still not completel working but a frist step
2012-11-05 10:46:28 +01:00
Thomas Müller
135680e50b
Merge pull request #242 from fmms/checkstyle05
...
Checkstyle fixes
2012-11-05 01:34:11 -08:00
Felix Moeller
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
Robin Appelman
4b940955dd
merge master into filesystem
2012-11-04 21:12:18 +01:00
Robin Appelman
4f32f49fb1
this line shouldn't be here
2012-11-04 21:00:36 +01:00
Robin Appelman
f187aa6c93
some more code reuse for fileactions
...
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
Arthur Schiwon
00bb246a0d
merge from master
2012-11-04 19:58:48 +01:00
Felix Moeller
9795bc19bf
Checkstyle: Fix the last two InvalidEOLChar
2012-11-04 18:42:18 +01:00
Felix Moeller
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
Felix Moeller
1205749f8c
Checkstyle: Fix the last two SpaceBeforeOpenBrace
2012-11-04 18:18:03 +01:00
Thomas Müller
8ac3849a95
Merge pull request #238 from fmms/checkstyle04
...
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke
80b9854710
Remove uneeded debug output
2012-11-04 14:26:45 +01:00
Felix Moeller
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
Felix Moeller
f8d1d7787e
Checkstyle fixes for SpaceBeforeOpenBrace
2012-11-04 10:46:32 +01:00
Jenkins for ownCloud
17d466b03b
[tx-robot] updated from transifex
2012-11-04 00:01:42 +01:00
Jenkins for ownCloud
2f0fd84477
[tx-robot] updated from transifex
2012-11-03 00:02:24 +01:00
Robin Appelman
4a5a36577e
merge master into filesystem
2012-11-02 21:42:29 +01:00
Felix Moeller
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
Jan-Christoph Borchardt
b05666219e
Merge branch 'master' into navigation
2012-11-02 13:36:01 +01:00
Arthur Schiwon
df8c67721d
code style
2012-11-02 09:42:10 +01:00
Lukas Reschke
d9e9761099
Fix a typo
2012-11-02 00:16:40 +01:00
Lukas Reschke
0f02b7dea6
Add CSRF token
2012-11-02 00:09:28 +01:00
Jenkins for ownCloud
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
Jan-Christoph Borchardt
e66482430e
Files: change wording 'From url' to 'From link'
2012-11-01 18:09:16 +01:00
Jan-Christoph Borchardt
01bd0efc36
Merge branch 'master' into navigation
2012-11-01 16:58:06 +01:00
Arthur Schiwon
5252fc52ed
LDAP: clear the cache not only when TTL changes, but with every settings update. Fixes #194
2012-11-01 16:48:17 +01:00
Robin Appelman
51ba12890d
Merge branch 'master' into filesystem
2012-11-01 16:16:02 +01:00
Björn Schießle
a9ce43de41
adapted comments to the code changes
2012-11-01 00:20:50 +01:00
Björn Schießle
3878950af4
load logging apps for webdav connections
...
Backport of de1b95c
2012-11-01 00:20:43 +01:00
Jenkins for ownCloud
a327087c8b
[tx-robot] updated from transifex
2012-11-01 00:02:14 +01:00
Jörn Friedrich Dreyer
b76306c144
Merge pull request #155 from owncloud/token-expired-IE
...
Send the requesttoken as form value
2012-10-31 04:50:18 -07:00
Tom Needham
43917e187b
External Share API: Move url down one level in response
2012-10-31 11:31:19 +00:00
Thomas Müller
f851738169
Merge pull request #152 from scambra/webdav-quota
...
checking quota in webdav
2012-10-31 03:03:46 -07:00
Jenkins for ownCloud
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
Robin Appelman
6e9e263497
merge master into filesystem
2012-10-30 22:59:55 +01:00
Lukas Reschke
116fa64294
Change IE8 to "older IE versions"
...
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
2012-10-30 17:29:26 +01:00
Lukas Reschke
ee1e4a7602
Send the requesttoken as form value
...
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.
Fixes #110 and related to #122
2012-10-30 17:19:49 +01:00
Jan-Christoph Borchardt
3db43a9980
Merge branch 'master' into navigation
2012-10-30 14:23:38 +01:00
scambra
d9c14292a4
fix checking quota in webdav, adding a sabredav plugin
2012-10-30 10:32:30 +01:00
Jenkins for ownCloud
56cf7660bd
[tx-robot] updated from transifex
2012-10-30 00:01:50 +01:00
Lukas Reschke
2e1199acb8
Merge pull request #133 from fmms/checkstyle02
...
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
blizzz
629d33967c
Merge pull request #142 from denis-b/patch-2
...
fix moving (in) dirs containing "+"
2012-10-29 09:25:09 -07:00
denis-b
2aa5a185d4
Update apps/files/ajax/move.php
...
fix moving dirs containing "+"
2012-10-29 16:46:22 +01:00
denis-b
b563935498
Update apps/files/index.php
...
fix dirnames containing "+" not displayed
2012-10-29 16:44:50 +01:00
Bart Visscher
ccbf4e993c
Use files remote webdav in compatibility files/webdav.php
2012-10-29 15:04:56 +01:00
Bart Visscher
ab4ade0d24
Remove fixme, problem is solved already
2012-10-29 15:04:55 +01:00
Jenkins for ownCloud
dbb4e74c79
[tx-robot] updated from transifex
2012-10-29 00:02:45 +01:00
Felix Moeller
dfc8228fb4
NoSpaceAfterComma
2012-10-28 23:58:08 +01:00
Michael Gapczynski
60e5054ae8
Fix shared status icons
2012-10-28 16:02:05 -04:00
Jan-Christoph Borchardt
d7abd44dea
merge breadcrumb root into navigation
2012-10-28 17:10:31 +01:00
Jan-Christoph Borchardt
7af8c6c3cb
first version of breadcrumb 'root', still have a weird feeling about this
2012-10-28 16:05:31 +01:00
Robin Appelman
0fbb99690b
properly replace fileaction icons with pngs when needed
2012-10-28 16:03:52 +01:00
Tom Needham
6675a46679
Fix url generated for public shared files
2012-10-28 15:03:21 +00:00
Georg Ehrke
4fd0514f0a
don't move file into subdirectory if a file with the same name already exists ( fixes #92 )
2012-10-28 15:23:40 +01:00
Jan-Christoph Borchardt
cf2a504d42
Merge branch 'master' into navigation
2012-10-28 14:10:10 +01:00
Robin Appelman
fe6b987b3d
use css to show/hide fileactions
2012-10-28 12:47:42 +01:00
Robin Appelman
d9ef6da2e4
code style
2012-10-28 12:47:42 +01:00
Tom Needham
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
Tom Needham
b079447988
Add API method for sharing a file, currently only via a link.
2012-10-28 11:06:47 +00:00
Robin Appelman
c4a793913c
Merge branch 'master' into filesystem
2012-10-28 10:28:25 +01:00
Jenkins for ownCloud
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
Arthur Schiwon
58828d205f
LDAP: usersInGroup now also does LDAP serverside search.
2012-10-27 19:43:07 +02:00
Arthur Schiwon
3f85432df9
LDAP: make filter in readAttribute configurable
2012-10-27 19:43:07 +02:00
Robin Appelman
c964fe9f8d
merge master into filesystem
2012-10-27 18:11:52 +02:00
Björn Schießle
72aebe3aa3
fix broken paths in versions app
2012-10-27 18:08:00 +02:00
Björn Schießle
7891add286
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 18:06:14 +02:00
Arthur Schiwon
1b2279c935
LDAP: getGroups to use paged searches
2012-10-27 17:46:01 +02:00
Arthur Schiwon
5b3c9518dc
LDAP: improve slicing
2012-10-27 17:46:01 +02:00
Arthur Schiwon
33aa630af3
LDAP: add error handling for failed searches
2012-10-27 17:46:01 +02:00
Arthur Schiwon
a053da58ce
LDAP: be careful which limit is send to possible paged LDAP search
2012-10-27 17:46:01 +02:00
Arthur Schiwon
977c4d1844
LDAP: use the correct attribute in filter
2012-10-27 17:46:01 +02:00
Arthur Schiwon
246221a677
LDAP: fix again proper check if groups are enabled
2012-10-27 17:46:01 +02:00
Arthur Schiwon
b942c1253e
remove TODO comment, it's done
2012-10-27 17:46:01 +02:00
Bart Visscher
d6953fa5ed
Remove wrongly committed files
2012-10-27 17:45:15 +02:00
Jan-Christoph Borchardt
b595ea6efc
first icon update. Next step: make sprited hover state (like for home already)
2012-10-27 17:44:24 +02:00
Björn Schießle
f151376ad5
remove remaining line from merge conflict
2012-10-27 17:06:13 +02:00
Bart Visscher
894d44e796
Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
...
Conflicts:
lib/base.php
2012-10-27 16:33:10 +02:00
Björn Schießle
a93660d37a
fix broken paths in versions app
2012-10-27 15:52:48 +02:00
Björn Schießle
c1a0e809bf
don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning
2012-10-27 15:50:17 +02:00
Robin Appelman
8973124574
Merge branch 'master' into filesystem
2012-10-27 15:31:27 +02:00
Bart Visscher
939b51e46f
Fix download url generation
2012-10-27 15:10:21 +02:00
Robin Appelman
38371d1275
Merge branch 'master' into filesystem
2012-10-27 14:28:24 +02:00
Robin Appelman
0fb707d2c9
some more porting of the sharing
2012-10-27 14:25:15 +02:00
Robin Appelman
86be7e8872
remove last uses of depricated OC_Filesystem
2012-10-27 12:23:13 +02:00
Arthur Schiwon
605281da9b
LDAP: let result processing in Access::search slice the array for not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow.
2012-10-27 12:19:08 +02:00
Arthur Schiwon
67cd268df9
LDAP: debug messaged
2012-10-27 12:19:08 +02:00
Arthur Schiwon
ee6fc22d4b
LDAP: sourced out paged search init into initPagedSearch method, making search slicker again
2012-10-27 12:19:08 +02:00
Robin Appelman
dea0d20a9a
fix delete and sort files
2012-10-27 12:18:01 +02:00
Bart Visscher
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Robin Appelman
cbc71784c0
Merge branch 'master' into filesystem
2012-10-27 10:02:26 +02:00
Jenkins for ownCloud
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
Jan-Christoph Borchardt
3eea7aac13
first base on navigation rework, less obtrusive, icons need to be updated, settings moved
2012-10-26 23:38:36 +02:00
Robin Appelman
6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
Robin Appelman
4b616764e8
Merge branch 'master' into filesystem
2012-10-26 22:32:44 +02:00
Arthur Schiwon
1313cad1b9
LDAP: let getUsers make use of paged search
2012-10-26 21:54:35 +02:00
Arthur Schiwon
84130b885f
LDAP: add support for paged searches.
2012-10-26 21:54:34 +02:00
Arthur Schiwon
fc446d0af4
LDAP: know, wether server supports paged search
2012-10-26 21:54:34 +02:00
Arthur Schiwon
3f78a8190f
LDAP: check for resource before unbinding
2012-10-26 21:54:34 +02:00
Robin Appelman
ad5957207d
merge master into filesystem
2012-10-26 18:29:24 +02:00
Jan-Christoph Borchardt
f477fda785
separate buttons for new file and upload
2012-10-26 18:16:42 +02:00
Robin Appelman
0e2bf8d373
Merge branch 'master' into filesystem
2012-10-26 10:42:41 +02:00
Jenkins for ownCloud
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
Robin Appelman
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
Bart Visscher
43ac43d7af
dir in newfile has to start with /
2012-10-25 08:37:13 +02:00
Jenkins for ownCloud
43bae1b473
[tx-robot] updated from transifex
2012-10-25 02:11:53 +02:00
Lukas Reschke
515e1b467e
Merge pull request #81 from fmms/master
...
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
Lukas Reschke
7454186806
Forget to urlencode the path
2012-10-24 18:00:19 +02:00
Lukas Reschke
ff6d2f16c4
urlencode
2012-10-24 17:58:52 +02:00
Lukas Reschke
694b1d397d
Revert e1a4fe9890
2012-10-24 17:58:52 +02:00
Robin Appelman
5a3d6805a2
cleanup OC_Files a bit
2012-10-24 15:52:30 +02:00
Björn Schießle
07e08d5928
urldecode target directory
2012-10-24 15:37:51 +02:00
Robin Appelman
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
Thomas Müller
41898a473e
Apply coding style guide
2012-10-24 14:43:34 +03:00
Björn Schießle
a9a27306de
fix copy&paste bug from previous commit
2012-10-24 13:11:29 +02:00
Björn Schießle
1d200c554f
Shared files are not stored in the file cache. Therefore we need to
...
use the share table from the db to find the item source if the public
link re-shares a already shared file.
2012-10-24 13:11:29 +02:00
Lukas Reschke
916e0fc343
Place the brackets in the first line
2012-10-24 13:09:09 +02:00
Thomas Müller
4c234bd666
Apply coding style guide
...
http://owncloud.org/dev/coding-style-guide/
2012-10-24 12:12:16 +03:00
Björn Schießle
070fe02448
calling OC_Filesystem at this point will initialize file system with wrong user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem.
2012-10-24 10:06:00 +02:00
Lukas Reschke
a7eb56c799
Merge pull request #76 from fmms/master
...
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
Jenkins for ownCloud
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
Arthur Schiwon
c443993fc2
LDAP: properly check if Groups-feature is enabled
2012-10-24 00:23:31 +02:00
Lukas Reschke
f112d8cd69
Merge pull request #75 from fmms/master
...
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
Lukas Reschke
dfecdb9700
Remove uneeded vendor prefixes
2012-10-24 00:00:33 +02:00
Lukas Reschke
f363bde121
Format the CSS in a readable way
2012-10-23 23:57:55 +02:00
Felix Moeller
561cbb2de6
NoSpaceAfterComma II
2012-10-23 23:01:10 +02:00
Felix Moeller
e73b817a38
Checkstyle: NoSpaceAfterComma
2012-10-23 22:53:54 +02:00
Lukas Reschke
e1a4fe9890
Fix urlencoding in the breadcrumb
2012-10-23 17:50:36 +02:00
Lukas Reschke
73f85c3b81
Merge pull request #62 from fmms/master
...
More Checkstyle warnings
2012-10-23 08:07:01 -07:00
Robin Appelman
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
icewind1991
ab944094e2
Merge pull request #12 from scambra/fixes
...
check free space using folder's owner
2012-10-23 07:02:21 -07:00
icewind1991
fbe059afd3
Merge pull request #59 from fmms/master
...
Starting point to take care of Checkstyle warnings
2012-10-23 06:58:15 -07:00
Arthur Schiwon
6a2a915559
Files: urldecode urlencoded dir names, fixes oc-2111
2012-10-23 13:50:24 +02:00
Felix Moeller
36d0d75901
Codestyle: FunctionCallArgumentSpacing
2012-10-23 08:35:54 +02:00
Felix Moeller
2d61f03452
More Checkstyle cleanup
...
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
Jenkins for ownCloud
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
Felix Moeller
6a00a6b9ed
Make Jenkins more happy.
...
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
Arthur Schiwon
78a1b987bb
LDAP: fix db update for Postgres
2012-10-23 00:18:43 +02:00
Arthur Schiwon
b879cd709e
LDAP: fix cache save and check, fixes oc-2118
2012-10-22 22:46:28 +02:00
Felix Moeller
03581ef463
Correct a first issue Checkstyle is complaining about ...
...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
Jenkins for ownCloud
d8e945466d
[tx-robot] updated from transifex
2012-10-22 02:06:18 +02:00
Robin Appelman
33cabcf590
postpone the cost of setting up some of the external storage backends untill we actually need it
2012-10-21 22:04:45 +02:00
Robin Appelman
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
Jenkins for ownCloud
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
Robin Appelman
6f1fbf97f7
some namespaces fixed for the shared backend
2012-10-21 00:27:55 +02:00
Robin Appelman
cfa036eaa9
drop filectime from the filesystem api's
2012-10-20 23:58:07 +02:00
Robin Appelman
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
Jenkins for ownCloud
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
Jenkins for ownCloud
f5043c0661
[tx-robot] updated from transifex
2012-10-19 02:08:00 +02:00
Robin Appelman
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +02:00
Arthur Schiwon
81cf726b18
unset UserID after Update
2012-10-18 18:45:03 +02:00
Thomas Müller
e4c0bb59e5
Merge pull request #39 from scambra/date-l10n-fixes
...
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer
e307bf31c8
fix oc-605
2012-10-18 14:19:34 +02:00
Jenkins for ownCloud
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
Thomas Müller
9f01cd05fb
Merge pull request #37 from scambra/js-interpolation-l10n
...
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
Sam Tuke
265f3654af
all unit files_encryption crypt unit tests now passing after merge
2012-10-17 16:35:19 +01:00
Bart Visscher
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
Susinthiran Sithamparanathan
b2b84f3a6f
Update Sabre to version 1.7.1
2012-10-17 16:17:36 +02:00
Robin Appelman
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
Jenkins for ownCloud
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
scambra
c814a7a841
use interpolation for some translations in js
2012-10-16 20:53:31 +02:00
scambra
5ecce8bfb7
Translate modification date when file is created/uploaded, use same strings as lib/template.php
2012-10-16 20:25:11 +02:00
Sam Tuke
8b01286a5d
Merged branch 'master'
2012-10-16 16:57:07 +01:00
Sam Tuke
06ea9c18f8
Development snapshot
...
Stream reading and writing of small and large files working, using write cache
2012-10-16 15:02:51 +01:00
Björn Schießle
b08a1696f5
normalize path to avoid problems with trailing slashes, double-slashes, etc.
2012-10-16 12:48:56 +02:00
Jenkins for ownCloud
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
Arthur Schiwon
24ad6b5a62
LDAP: fix retrieval of Quota and Email
2012-10-15 18:47:28 +02:00
Arthur Schiwon
5708488b3e
make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs
2012-10-15 18:16:27 +02:00
Arthur Schiwon
800fd5fd79
LDAP: check if index is set, fix Notices
2012-10-15 17:17:37 +02:00
Jenkins for ownCloud
cf7df2db7a
[tx-robot] updated from transifex
2012-10-15 02:09:11 +02:00
Bart Visscher
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
Jenkins for ownCloud
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
Robin Appelman
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
Jenkins for ownCloud
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
Robin Appelman
5b2f3c7f72
fix blocking drag & drop upload of folders
2012-10-12 15:30:16 +02:00
Robin Appelman
c099545b6d
don't throw errors if certificate folder doesn't exist
2012-10-12 14:52:22 +02:00
Lukas Reschke
e5f2d46c6f
Sanitize user input
2012-10-12 14:10:05 +02:00
Lukas Reschke
e45f36c2d4
Sanitize user input
2012-10-12 14:09:58 +02:00
Jenkins for ownCloud
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
Robin Appelman
141ff806c6
fix namespace problems for external storage backends
2012-10-11 23:17:59 +02:00
Robin Appelman
542869114a
implement getId for the external storage providers
2012-10-11 23:06:57 +02:00
Robin Appelman
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
Robin Appelman
92ddefe5a6
fix filetype for smb storage backend
2012-10-11 22:18:34 +02:00
Robin Appelman
5698c8519a
fix webdav storage backend when trying to open a non existing file for reading
2012-10-11 22:18:34 +02:00
Robin Appelman
5256301a53
skip the files_external test cases the correct way
2012-10-11 22:18:34 +02:00
Benjamin Liles
8336b3287e
Various bug fixes for swift
2012-10-11 08:52:21 -05:00
Björn Schießle
77d91d5a03
generate correct link for shared files and shared directories
2012-10-11 13:45:16 +02:00
Jenkins for ownCloud
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
Sam Tuke
4da67b0a08
Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests
2012-10-10 18:40:59 +01:00
Robin Appelman
5c6e9518ed
drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath
2012-10-10 17:46:29 +02:00
Björn Schießle
41640b4b91
don't show the share action in the file view for publically shared files.
2012-10-10 17:44:21 +02:00
Björn Schießle
4a712bdd48
only check if #dropdown hasClass drop-versions if a drop down is open. Otherwise it will never open the history drop-down
2012-10-10 13:46:51 +02:00
Robin Appelman
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
Björn Schießle
33dcb3b1f4
fix missing dir creation for file versions (OC_Filesystemview::mkdir doesn't work here because it doesn't create directories recursively)
2012-10-10 11:49:16 +02:00
Robin Appelman
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
Thomas Müller
29fa9dfb79
Merge pull request #25 from visit1985/uploadfilesize
...
fixed max possible upload size for files app in admin screen
2012-10-10 00:41:19 -07:00
Jenkins for ownCloud
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
Michael Gapczynski
4e6f720f14
Fix closing the sharing dropdown by clicking on the share button
2012-10-09 19:23:44 +02:00
Björn Schießle
293484d1ee
add directory while creating mount point
2012-10-09 15:18:21 +02:00
VicDeo
f29f1cad1d
Prevent Versions click handler from closing sharing dropdown
2012-10-09 13:00:33 +03:00
Jenkins for ownCloud
f1fc73ea5b
[tx-robot] updated from transifex
2012-10-09 02:07:41 +02:00
Björn Schießle
32e2d7ef8f
check if ID was assigned
2012-10-08 17:47:02 +02:00
Björn Schießle
277dd2b0a9
remove debug output
2012-10-08 17:32:04 +02:00
Björn Schießle
2923d24921
add data-id directly after upload/creation to the file list (bugfix for #1917 )
2012-10-08 17:30:35 +02:00
Robin Appelman
c815fd5a5c
fix files_external test cases
2012-10-08 14:31:13 +02:00
Robin Appelman
e7899e17de
merge phpunit into filesystem
2012-10-08 13:53:53 +02:00
Björn Schießle
4dba91838f
add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views.
2012-10-08 10:28:29 +02:00
Jenkins for ownCloud
b934668b9e
[tx-robot] updated from transifex
2012-10-08 02:07:01 +02:00
Michael Gapczynski
995b8bf12a
Remove old Shared folders from the file cache, fixes bug oc-1911
2012-10-07 17:34:21 -04:00
Michael Gapczynski
4b446f3edd
Revert part of 5beca59b
, fixes file upload bug oc-1926
2012-10-07 17:17:37 -04:00
Jenkins for ownCloud
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
Michael Göhler
7f2208b9a1
fixed max possible upload size for files app in admin screen
...
used get_cfg_var() to get the real limit from php.ini instead of .ht_access
dont know why we used PHP_INT_MAX here...
2012-10-07 00:31:07 +02:00
Robin Appelman
a203a4a1c7
add support to mount a specific folder from dropbox
2012-10-06 13:44:53 +02:00
Robin Appelman
54695b11eb
test case for dropbox storage
2012-10-06 13:43:34 +02:00
Jenkins for ownCloud
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
Arthur Schiwon
68bb3809c7
LDAP: we're good for 0.3 now. No code change
2012-10-06 00:38:10 +02:00
Björn Schießle
4f7c7c615e
prevent xss attacks
2012-10-05 17:05:23 +02:00
Björn Schießle
5e2bce24b4
enable user to download selected files from publically shared directory
2012-10-05 16:12:04 +02:00
Björn Schießle
c99f62891a
breadcrumbs fixed for public share view
2012-10-05 15:06:59 +02:00
Björn Schießle
0d081ac5ac
register download action for directories
2012-10-05 14:28:23 +02:00
Björn Schießle
ef8a4a1629
register download action for files
2012-10-05 14:28:23 +02:00
Björn Schießle
99f4d949c1
fix download link for single files in publicly shared directory
2012-10-05 14:28:23 +02:00
Björn Schießle
72a48ca35e
fix download of single publically shared files.
2012-10-05 12:01:18 +02:00
Björn Schießle
dcad7aec82
fixed download of complete publically shared folder
2012-10-05 11:38:00 +02:00
Björn Schießle
f4136854b6
stripsplashes doesn't work if the slash is the only character -> creating file in root dir leads to "//filename"
2012-10-05 11:15:32 +02:00
Björn Schießle
a611ce4f33
baseDir has to be the whole path to work with shared directories below the root directory.
2012-10-05 10:32:38 +02:00
Björn Schießle
b88a61c633
no content area, it overlaps the file list
2012-10-05 10:32:38 +02:00
Björn Schießle
5beca59b9c
check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist)
2012-10-05 10:32:38 +02:00
Jenkins for ownCloud
4fd53eca06
[tx-robot] updated from transifex
2012-10-05 02:06:09 +02:00
Jenkins for ownCloud
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
Michael Gapczynski
51321526e2
Prevent displaying errors if public link url parameters are incorrect
2012-10-03 16:14:54 -04:00
Jenkins for ownCloud
6fada7a4c0
[tx-robot] updated from transifex
2012-10-03 02:05:14 +02:00
Robin Appelman
ac44506b40
Merge branch 'master' into filesystem
2012-10-02 23:29:13 +02:00
Jenkins for ownCloud
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
Thomas Mueller
7abe1360b2
l18n support added to files_external/js
2012-10-02 23:09:28 +02:00
Björn Schießle
92b37119e3
remove textbox after pressing "enter" even if the name is the same
2012-10-02 18:38:17 +02:00
Jörn Friedrich Dreyer
39735721ec
escape identifiers in queries
2012-10-02 14:11:25 +02:00
Frank Karlitschek
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Björn Schießle
550813ce41
don't use the complete path but the basename if the file/foder has no extension. Otherwise
...
we can end up with different items in the shared directory with the same name (Also folder names can contain dots)
2012-10-02 11:41:26 +02:00
Jenkins for ownCloud
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
Lukas Reschke
538c2662a9
Merge pull request #23 from lipemat/patch-1
...
Fix the File Upload Button in Chrome
Arrow was showing under the button in Chrome. With this commit it should be shown correctly.
2012-10-01 10:28:51 -07:00
Arthur Schiwon
33e9399ba3
LDAP: fix sharing doesn't work with ldap groups, oc-1819
2012-10-01 18:27:58 +02:00
Arthur Schiwon
b23ad579dc
Sharing: backward compatibility to links from OC 4.0.
2012-10-01 14:39:53 +02:00
Robin Appelman
b7eb3f3dff
merge master into filesystem
2012-10-01 14:21:49 +02:00
Mat Lipe
d1010e58d8
Update apps/files/css/files.css
...
Fixed a strange comment issue
2012-10-01 06:43:31 -05:00
Mat Lipe
2330dd5f21
Update apps/files/css/files.css
...
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
2012-09-30 20:02:52 -05:00
Jenkins for ownCloud
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
Jenkins for ownCloud
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
Bart Visscher
22d22d19c0
Do urlencoding in linkTo functions
2012-09-28 22:27:52 +02:00
Bart Visscher
dbdf3bde7c
Implement route for download in OC_Search_Provider_File
2012-09-28 22:20:17 +02:00
Bart Visscher
c9317b5a68
Merge branch 'master' into routing
2012-09-28 21:41:21 +02:00
Bart Visscher
4e2f575938
Correctly fix oc-1016 and fix downloading of files
2012-09-28 21:18:20 +02:00
Bart Visscher
bf1057143c
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/filelist.js
core/js/js.js
lib/ocs.php
2012-09-28 15:38:49 +02:00
Jenkins for ownCloud
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
Lukas Reschke
232936b99a
This .gitkeep is unneeded
2012-09-27 22:24:56 +02:00
Arthur Schiwon
3fa4b34a69
LDAP: comparison, not assignment. Thanks to Manuel Delgado
2012-09-27 19:52:52 +02:00
Björn Schießle
aa9ffd119a
check if file really exist before add/remove it
2012-09-27 12:37:23 +02:00
Björn Schießle
a56f2ec183
only upload valid ssl root certificates
2012-09-27 11:21:29 +02:00
Jenkins for ownCloud
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
Björn Schießle
21c6cc45e6
take '\' on windows systems into account to prevent file deletion above upload direectory
2012-09-26 23:08:40 +02:00
Björn Schießle
9ab887fed5
fix security issue, don't allow to go back in the path
2012-09-26 21:35:14 +02:00
Robin Appelman
88bca9bc49
Merge branch 'master' into filesystem
2012-09-26 17:52:28 +02:00
Robin Appelman
cfbca40fbe
fix sharing for newly uploaded or created files
2012-09-26 13:25:11 +02:00
Jenkins for ownCloud
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
Arthur Schiwon
0192d920f0
Sharing: write update errors to logfile; do not die on errors
2012-09-26 12:27:43 +02:00
Björn Schießle
fcd70246db
Merge branch 'master' of github.com:owncloud/core
2012-09-26 10:50:06 +02:00
Björn Schießle
c3c6e52104
- take webdav namespace for properties into account
...
- change update routine to add the namesapce to all stored properties
2012-09-26 10:48:30 +02:00
Jenkins for ownCloud
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
Arthur Schiwon
7b8c7aaf0d
Add missing Sharing permission
2012-09-25 18:01:56 +02:00
Arthur Schiwon
80fde2d8d1
Sharing update: take over reshares and thus don't fail
2012-09-25 12:14:20 +02:00
Björn Schießle
25499644e3
Merge branch 'master' of github.com:owncloud/core
2012-09-25 12:02:02 +02:00
Björn Schießle
90a1bd5721
seperate the form to set up the mount points and the form to upload ssl certificates
2012-09-25 12:01:09 +02:00
Arthur Schiwon
15e02726d7
Fix files_sharing update script, by making filesystem and users available
2012-09-25 11:47:53 +02:00
Jenkins for ownCloud
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
Brice Maron
7aca730f71
Small css fix for button new in files. fix oc-1638
2012-09-24 18:40:59 +00:00
Jenkins for ownCloud
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
Robin Appelman
4d2669f6b3
Merge branch 'master' into filesystem
2012-09-23 14:56:58 +02:00
Robin Appelman
a22a5d6807
some js style fixes
2012-09-23 03:16:52 +02:00
Robin Appelman
eed1ccd164
Merge branch 'master' into filesystem
2012-09-23 02:41:31 +02:00
Jenkins for ownCloud
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
Robin Appelman
f360d7c736
add getId to shared storage backend
2012-09-23 01:51:00 +02:00
Robin Appelman
96b798a59f
move storage backend test cases to their own namespace
2012-09-22 14:51:15 +02:00
Robin Appelman
93292516d9
Merge branch 'master' into filesystem
2012-09-22 14:28:14 +02:00
Lukas Reschke
b4de89e6b4
Sanitize download URL
...
@MTGap Can you please check if this break something?
2012-09-22 11:20:17 +02:00
Jenkins for ownCloud
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
Jenkins for ownCloud
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
Thomas Müller
d5055639b2
Merge pull request #15 from scambra/delete-fixes
...
use post to delete files, get has a limit and fails with many files
2012-09-21 16:11:11 -07:00
Thomas Müller
ac69974d73
Merge pull request #17 from scambra/4.5-l10n-fixes
...
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
Bart Visscher
8cfa618df5
Catch exceptions in upgrading files_sharing, skip the errors for now
2012-09-21 23:31:44 +02:00
Bart Visscher
11bdc8baa8
Fix the mimetype filter in OC_Share_Backend_File
2012-09-21 23:17:12 +02:00
Bart Visscher
ee77ef86d3
Check mimetype filter in file share backend
2012-09-21 21:32:09 +02:00
Björn Schießle
3d2cd64a48
add a line break after every certificate
2012-09-21 16:54:08 +02:00
Tom Needham
bcd3d1116c
Change background colour of upload button to be consistant with new button
2012-09-21 12:45:11 +00:00
Arthur Schiwon
2a7a928ae9
LDAP: replace expensive recursiveArraySearch with direct SQL search, leading to a performance boost. Imorives UX especially on directories with tons of users, solves complains on ML and probably fixes oc.1080
2012-09-21 13:03:28 +02:00
scambra
107b641708
translate rename and history actions
2012-09-21 12:30:13 +02:00
scambra
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
Jenkins for ownCloud
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
Arthur Schiwon
57c02d16ca
LDAP: add forgotten class, fixes oc-1803
2012-09-20 16:59:28 +02:00
Frank Karlitschek
6c644a0c83
change the new button color on mouse over so that the user understands that the button is actually two buttons.
2012-09-20 14:59:28 +02:00
icewind1991
4ea128ee43
Merge pull request #13 from scambra/safari-fixes
...
fix js success callback on safari when uploading files
2012-09-20 02:24:27 -07:00
scambra
1b411df83e
use post to delete files, get has a limit and fails with many files
2012-09-20 08:28:35 +02:00
scambra
aee8949c92
fix js success callback on safari when uploading files
2012-09-20 08:02:55 +02:00
Jenkins for ownCloud
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
Bernhard Posselt
1c643ce4bc
made upload button the same height in chrome and firefox
...
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
2012-09-19 22:10:13 +00:00
Tom Needham
f9127192da
Fix styling of public shared files download button
2012-09-19 19:51:52 +00:00
Tom Needham
d7b878b303
Dynamicly resize public shared images
2012-09-19 19:46:49 +00:00
scambra
2b5133a1c4
check free space using folder's owner
2012-09-19 21:31:29 +02:00
Bart Visscher
5f997021d1
Fix syntax bug
2012-09-19 21:29:16 +02:00
Bart Visscher
ee32d1aad5
Fix versioning of shared files
2012-09-19 21:29:16 +02:00
Bart Visscher
01ce2babd1
Fix sharing of single files, target name was not correct
2012-09-19 21:29:16 +02:00
Arthur Schiwon
f66c441f77
LDAP: take out ldapUuidAttribute from on-the-fly check, cannot be set by the user and would lead to server error. Fixes oc-1625
2012-09-19 15:37:05 +02:00
Tom Needham
73ed13fe75
Increase click area of breadcrumb, fix oc-703
2012-09-19 12:31:02 +00:00
Björn Schießle
223bf3e47c
fix for bug #1752 (Renaming of folders in files view does not work correctly in firefox 15)
2012-09-19 14:05:09 +02:00
Björn Schießle
c199c4ad67
Merge branch 'master' of github.com:owncloud/core
2012-09-19 12:03:58 +02:00
Björn Schießle
6596094a28
add generated unique file name to the uploadingFiles list instead of the original name
2012-09-19 12:02:36 +02:00
Björn Schießle
1e880feab1
execute lastAction() before add new one
2012-09-19 11:56:31 +02:00
Michael Gapczynski
39e587b52c
Remove the content and table to prevent covering the download link
2012-09-19 00:27:53 -04:00
Michael Gapczynski
749b5b52ca
Show preview for public folder links
2012-09-18 23:56:14 -04:00
Jenkins for ownCloud
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
Tom Needham
8a74a39c42
Fix oc-1769, renaming folders with extensions
2012-09-18 22:08:34 +00:00
Björn Schießle
842cd57fa7
use more oc file operations instead of plain PHP functions
2012-09-18 17:04:22 +02:00
Jenkins for ownCloud
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
Arthur Schiwon
6444c27e6a
LDAP: fix MySQL-query with DUAL table by removing wrong backticks. Got broke when they were added to SQL queries.
2012-09-17 22:50:08 +02:00
Bart Visscher
b04c7175dc
Check if the versioned file exists before trying to do the versioning
...
This didn't work with chunked uploading
2012-09-17 20:00:31 +02:00
Tom Needham
597fed4fde
Fix oc-1726, cannot delete multiple files one by one without refresh
2012-09-17 15:29:15 +00:00
Thomas Müller
21bffbfb69
Enhanced space handling - thx fmms
2012-09-17 11:14:44 +03:00
Thomas Müller
7a7d2a06b3
Adding a few more string to translation
2012-09-17 10:54:06 +03:00
Jenkins for ownCloud
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
Michael Gapczynski
89fb5d47a4
Add chosen script and style, bug fix for oc-1745
2012-09-16 13:27:27 -04:00
Frank Karlitschek
f17555285e
Merge branch 'master' of https://github.com/owncloud/core
2012-09-16 17:14:04 +02:00
Frank Karlitschek
9d533fcd72
add a legend tag. it´s consistent and looks nicer
2012-09-16 17:13:16 +02:00
Robin Appelman
7da3492ab5
show the size of new files when using New->From Url
2012-09-16 17:05:08 +02:00
Jenkins for ownCloud
6568671bdc
[tx-robot] updated from transifex
2012-09-16 02:03:40 +02:00
Jenkins for ownCloud
fbdefd5601
[tx-robot] updated from transifex
2012-09-15 02:05:52 +02:00
Jenkins for ownCloud
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
Michael Gapczynski
f8d907df71
Set configured to true after configuring Dropbox storage
2012-09-12 21:30:04 -04:00
Jenkins for ownCloud
bb0b438ace
[tx-robot] updated from transifex
2012-09-13 02:03:54 +02:00
Bart Visscher
10b74f9d05
Don't hide errors doing the versioning copy
2012-09-13 00:09:00 +02:00
Michael Gapczynski
87b7a23648
Don't get metadata directly from the 'cached' file cache after upload
2012-09-12 17:00:46 -04:00
Sam Tuke
9bfdf47cd4
Fixed bug oc-1659 - history dialogue cannot be closed once opened
2012-09-12 14:10:12 +01:00
Jenkins for ownCloud
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
Sam Tuke
ed980674a6
Development snapshot
2012-09-11 13:40:45 +01:00
Michael Gapczynski
ff6141b1e9
Change version number update occurs on to prevent problem with betas, users using the 4.5 betas will have to manually trigger the update if they want to get their old shared files back again
2012-09-10 21:57:13 -04:00
Jenkins for ownCloud
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
Jenkins for ownCloud
bd720bdf4c
[tx-robot] updated from transifex
2012-09-10 02:04:59 +02:00
Michael Gapczynski
deb1fbf9a1
Provide update script for files sharing
2012-09-09 18:29:47 -04:00
Michael Gapczynski
5c5955b31f
Disable link sharing for folders temporarily - next release
2012-09-09 14:52:03 -04:00
Michael Gapczynski
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
Robin Appelman
a050915167
move breadcrumb css to core so we can reuse it
2012-09-09 03:00:01 +02:00
Jenkins for ownCloud
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
Jenkins for ownCloud
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
Robin Appelman
bd83422095
put filestorages in a namespace
2012-09-07 18:30:48 +02:00
Bart Visscher
5eba579827
Merge branch 'master' into routing
...
Conflicts:
apps/files/js/fileactions.js
lib/base.php
lib/helper.php
lib/ocs.php
2012-09-07 15:51:44 +02:00
Thomas Mueller
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
Bart Visscher
785aa751bb
Whitespace fixes
2012-09-07 14:10:43 +02:00
Bart Visscher
285c198c36
EOL fixes
...
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
Michael Gapczynski
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
Michael Gapczynski
17dadd5c8a
Don't show the delete all action if delete permission is not granted
2012-09-07 00:02:22 -04:00
Jenkins for ownCloud
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
Michael Gapczynski
d936590f77
Don't pass content for a new text file from UI, fixes bug oc-1660
2012-09-06 16:01:51 -04:00
Michael Gapczynski
837eb1871d
Don't delete the file anymore to replace it in the UI, just overwrite it
2012-09-05 22:13:50 -04:00
Michael Gapczynski
a5211e31bc
Add permissions to new files/folders, bug fix for oc-1649
2012-09-05 21:47:09 -04:00
Jenkins for ownCloud
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
Thomas Mueller
ebb28412ca
no more require_once()
2012-09-05 23:28:59 +02:00
Bart Visscher
9329af921d
Add missing ; to js code
2012-09-05 22:26:09 +02:00
Robin Appelman
aa8cee1afa
I don't think this file was meant to be commited
2012-09-05 19:42:26 +02:00
Michael Gapczynski
a26ea6d65c
Implement support for replacing files during upload with the actions: replace, suggest name, and cancel
2012-09-05 00:12:25 -04:00
Jenkins for ownCloud
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
Thomas Mueller
02f9de55a3
add translation string
2012-09-04 23:42:49 +02:00
Bart Visscher
f188f6cc2f
Fix some jslint warnings
2012-09-04 21:27:37 +02:00