Commit Graph

8359 Commits

Author SHA1 Message Date
Michael Gapczynski a52aa69ffe Rearrange code to prepare for updater feedback 2013-01-03 14:11:00 -05:00
Michael Gapczynski 4e1923b01e Merge pull request #1067 from owncloud/fix-logout
Check if oc_token cookie exists during logout
2013-01-03 08:36:19 -08: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
Michael Gapczynski ce443818d4 Check if oc_token cookie exists before trying to use it 2013-01-02 19:59:04 -05:00
Thomas Mueller 045c0acc92 workaround for 32-bit systems to handle filesizes bigger than 2GB 2013-01-03 00:38:44 +01:00
Thomas Mueller 34e5cb5070 fixing indent 2013-01-03 00:13:30 +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 Müller 9dc5ea172e Merge pull request #975 from irgsmirx/patch-1
Update lib/util.php
2013-01-02 14:01:38 -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 8240717309 Merge pull request #1062 from owncloud/fix-1048-master
add smtp port configuration option
2013-01-02 10:48:58 -08:00
Thomas Mueller 1727b2e84d add smtp port configuration option 2013-01-02 19:04:08 +01:00
Jörn Friedrich Dreyer e2f549f6d7 remove css not selector - incompatible with ie8 2013-01-02 18:01:33 +01:00
Jörn Friedrich Dreyer 166da88b73 Merge pull request #945 from owncloud/fix_app_management_in_ie8
since @tanghus and @DeepDiver1975 gave me their 👍 I'll merge this now: Fix app management in ie8
2013-01-02 08:17:28 -08:00
Jörn Friedrich Dreyer fe4f056a23 use jQuery.parseJSON fallback for IE6/7/8 2013-01-02 17:13:23 +01:00
Jörn Friedrich Dreyer 03b8a065cf input/form switching cleanup 2013-01-02 17:03:16 +01:00
Jörn Friedrich Dreyer 4a7604daa2 remove , at end of js. IE8 chokes on this 2013-01-02 17:02:06 +01:00
Robin Appelman 54f6f1e6b7 phpdoc fixes for public api 2013-01-02 16:38:20 +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
Jörn Friedrich Dreyer 5b07e722cb combine ie8 fix with debug check 2013-01-02 12:21:30 +01:00
Jörn Friedrich Dreyer ed06070741 omit type attribute in script tag to use fallback (text/javascript) 2013-01-02 12:13:07 +01:00
Jörn Friedrich Dreyer e998da06d1 fix broken console.log in ie8 2013-01-02 12:13:07 +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 8a5f583cac Remove WIP OAuth code 2012-12-31 16:19:46 +00:00
Tom Needham 2ac616682e Remove accidental submodule 2012-12-31 16:09:37 +00:00
Tom Needham 9626d9ce31 Code cleanup and add copyright info 2012-12-31 16:08:21 +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
Tom Needham 218a5ea890 Remove unused methods 2012-12-31 14:16:29 +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
Michael Gapczynski 7980bccaab Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826 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
Thomas Müller 36da34e5f6 Merge pull request #902 from owncloud/storage-wording
Storage wording
2012-12-28 23:19:52 -08:00
Michael Gapczynski b5b48428ab Replace %2F with / in breadcrumbs 2012-12-28 19:41:37 -05:00
Michael Gapczynski f922f836ce Change old variable name $default_quota to $defaultQuota 2012-12-28 19:14:33 -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