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

4062 commits

Author SHA1 Message Date
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
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
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
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
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
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
Jörn Friedrich Dreyer
fc64e8ec58 fix error when wrong dir was specified 2013-01-03 13:34:56 +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
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
Jenkins for ownCloud
516464ba94 [tx-robot] updated from transifex 2013-01-02 00:05:14 +01: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
b5b48428ab Replace %2F with / in breadcrumbs 2012-12-28 19:41:37 -05:00
Jenkins for ownCloud
9aefbea074 [tx-robot] updated from transifex 2012-12-29 00:08:28 +01:00
Thomas Mueller
a3206b4e97 only show the max possible upload of 2GB on a 32 bit system. 
for a 64 bit system we have no such limitation
refs #856

Conflicts:
	apps/files/templates/admin.php
 2012-12-28 22:17:38 +01:00
Thomas Mueller
7b72424a39 Revert "fixed max possible upload size for files app in admin screen" 
This reverts commit 7f2208b9a1.

Conflicts:
	apps/files/admin.php
 2012-12-28 22:14:32 +01:00
Jenkins for ownCloud
e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Jenkins for ownCloud
27f9ea2abb [tx-robot] updated from transifex 2012-12-27 00:05:17 +01:00
Jenkins for ownCloud
b7257b2524 [tx-robot] updated from transifex 2012-12-26 00:12:10 +01:00
Jenkins for ownCloud
5d59ac0739 [tx-robot] updated from transifex 2012-12-25 00:11:11 +01:00
Jenkins for ownCloud
7d52c39419 [tx-robot] updated from transifex 2012-12-24 00:12:16 +01:00
Jenkins for ownCloud
0656b41747 [tx-robot] updated from transifex 2012-12-23 00:10:23 +01:00
Jenkins for ownCloud
05fda76776 [tx-robot] updated from transifex 2012-12-22 00:26:25 +01:00
Jenkins for ownCloud
3e39c39d6a [tx-robot] updated from transifex 2012-12-21 00:11:31 +01:00
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