]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agojs optimisations and style fixes
Thomas Mueller [Sun, 6 Jan 2013 09:41:07 +0000 (10:41 +0100)]
js optimisations and style fixes

11 years agoMerge branch 'master' into fixing-998-master
Thomas Mueller [Sun, 6 Jan 2013 09:36:14 +0000 (10:36 +0100)]
Merge branch 'master' into fixing-998-master

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 4 Jan 2013 23:03:58 +0000 (00:03 +0100)]
[tx-robot] updated from transifex

11 years agojavascript syntax error fixed on the way
Thomas Mueller [Fri, 4 Jan 2013 22:38:07 +0000 (23:38 +0100)]
javascript syntax error fixed on the way

11 years agonew javascript notification functions used within users.js
Thomas Mueller [Fri, 4 Jan 2013 22:37:21 +0000 (23:37 +0100)]
new javascript notification functions used within users.js

11 years agojavascript notification functions have been moved to js.js for common use
Thomas Mueller [Fri, 4 Jan 2013 22:34:09 +0000 (23:34 +0100)]
javascript notification functions have been moved to js.js for common use

11 years agoMerge pull request #1081 from owncloud/fix-issue-1075
Thomas Müller [Fri, 4 Jan 2013 18:17:25 +0000 (10:17 -0800)]
Merge pull request #1081 from owncloud/fix-issue-1075

Remove echo from lost password page

11 years agoRemove echo from lost password page
Michael Gapczynski [Fri, 4 Jan 2013 16:12:28 +0000 (11:12 -0500)]
Remove echo from lost password page

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 4 Jan 2013 12:23:31 +0000 (13:23 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1067 from owncloud/fix-logout
Michael Gapczynski [Thu, 3 Jan 2013 16:36:19 +0000 (08:36 -0800)]
Merge pull request #1067 from owncloud/fix-logout

Check if oc_token cookie exists during logout

11 years agoMerge pull request #1063 from owncloud/translate_not_enough_space_available
Thomas Müller [Thu, 3 Jan 2013 14:46:36 +0000 (06:46 -0800)]
Merge pull request #1063 from owncloud/translate_not_enough_space_available

add translation call for 'Not enough space available' upload error

11 years agofix error when wrong dir was specified
Jörn Friedrich Dreyer [Thu, 3 Jan 2013 12:31:23 +0000 (13:31 +0100)]
fix error when wrong dir was specified

11 years agomove $l to top
Jörn Friedrich Dreyer [Thu, 3 Jan 2013 10:57:42 +0000 (11:57 +0100)]
move $l to top

11 years agoalso translate 'No file was uploaded. Unknown error'
Jörn Friedrich Dreyer [Thu, 3 Jan 2013 10:57:17 +0000 (11:57 +0100)]
also translate 'No file was uploaded. Unknown error'

11 years agoCheck if oc_token cookie exists before trying to use it
Michael Gapczynski [Thu, 3 Jan 2013 00:59:04 +0000 (19:59 -0500)]
Check if oc_token cookie exists before trying to use it

11 years agofixing indent
Thomas Mueller [Wed, 2 Jan 2013 22:02:38 +0000 (23:02 +0100)]
fixing indent

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 2 Jan 2013 23:05:19 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1041 from owncloud/fixing-856-master
Thomas Müller [Wed, 2 Jan 2013 22:58:54 +0000 (14:58 -0800)]
Merge pull request #1041 from owncloud/fixing-856-master

Fixing #856 master

11 years agoMerge pull request #975 from irgsmirx/patch-1
Thomas Müller [Wed, 2 Jan 2013 22:01:38 +0000 (14:01 -0800)]
Merge pull request #975 from irgsmirx/patch-1

Update lib/util.php

11 years agofixing undefined variable $l
Thomas Mueller [Wed, 2 Jan 2013 21:15:43 +0000 (22:15 +0100)]
fixing undefined variable $l

11 years agoadd translation call for 'Not enough space available' upload error
Jörn Friedrich Dreyer [Wed, 2 Jan 2013 20:00:50 +0000 (21:00 +0100)]
add translation call for 'Not enough space available' upload error

11 years agoMerge pull request #1062 from owncloud/fix-1048-master
Jörn Friedrich Dreyer [Wed, 2 Jan 2013 18:48:58 +0000 (10:48 -0800)]
Merge pull request #1062 from owncloud/fix-1048-master

add smtp port configuration option

11 years agoadd smtp port configuration option
Thomas Mueller [Wed, 2 Jan 2013 18:04:08 +0000 (19:04 +0100)]
add smtp port configuration option

11 years agoMerge pull request #945 from owncloud/fix_app_management_in_ie8
Jörn Friedrich Dreyer [Wed, 2 Jan 2013 16:17:28 +0000 (08:17 -0800)]
Merge pull request #945 from owncloud/fix_app_management_in_ie8

since @tanghus and @DeepDiver1975 gave me their :+1: I'll merge this now: Fix app management in ie8

11 years agophpdoc fixes for public api
Robin Appelman [Tue, 25 Dec 2012 17:17:32 +0000 (18:17 +0100)]
phpdoc fixes for public api

11 years agonotifications are now shown/hidden using the js functions hideNotification and showNo...
Thomas Mueller [Wed, 2 Jan 2013 14:09:40 +0000 (15:09 +0100)]
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.

11 years agomake usedSpacePercent available in the files app
Thomas Mueller [Wed, 2 Jan 2013 14:06:49 +0000 (15:06 +0100)]
make usedSpacePercent available in the files app

11 years agomoving storage calculation code to OC_Helper::getStorageInfo()
Thomas Mueller [Wed, 2 Jan 2013 13:35:45 +0000 (14:35 +0100)]
moving storage calculation code to OC_Helper::getStorageInfo()

11 years agocombine ie8 fix with debug check
Jörn Friedrich Dreyer [Wed, 2 Jan 2013 11:21:30 +0000 (12:21 +0100)]
combine ie8 fix with debug check

11 years agoomit type attribute in script tag to use fallback (text/javascript)
Jörn Friedrich Dreyer [Tue, 18 Dec 2012 20:47:51 +0000 (21:47 +0100)]
omit type attribute in script tag to use fallback (text/javascript)

11 years agofix broken console.log in ie8
Jörn Friedrich Dreyer [Tue, 18 Dec 2012 20:38:01 +0000 (21:38 +0100)]
fix broken console.log in ie8

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 1 Jan 2013 23:05:14 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 31 Dec 2012 23:04:42 +0000 (00:04 +0100)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 30 Dec 2012 23:05:31 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1043 from owncloud/fix_breadcrumb_slashes
Lukas Reschke [Sun, 30 Dec 2012 16:56:32 +0000 (08:56 -0800)]
Merge pull request #1043 from owncloud/fix_breadcrumb_slashes

Replace %2F with / in breadcrumbs

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 29 Dec 2012 23:05:52 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #902 from owncloud/storage-wording
Thomas Müller [Sat, 29 Dec 2012 07:19:52 +0000 (23:19 -0800)]
Merge pull request #902 from owncloud/storage-wording

Storage wording

11 years agoReplace %2F with / in breadcrumbs
Michael Gapczynski [Sat, 29 Dec 2012 00:41:37 +0000 (19:41 -0500)]
Replace %2F with / in breadcrumbs

11 years agoChange old variable name $default_quota to $defaultQuota
Michael Gapczynski [Sat, 29 Dec 2012 00:14:33 +0000 (19:14 -0500)]
Change old variable name $default_quota to $defaultQuota

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 28 Dec 2012 23:08:28 +0000 (00:08 +0100)]
[tx-robot] updated from transifex

11 years agoonly show the max possible upload of 2GB on a 32 bit system.
Thomas Mueller [Fri, 28 Dec 2012 20:57:05 +0000 (21:57 +0100)]
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

11 years agoRevert "fixed max possible upload size for files app in admin screen"
Thomas Mueller [Fri, 28 Dec 2012 21:14:32 +0000 (22:14 +0100)]
Revert "fixed max possible upload size for files app in admin screen"

This reverts commit 7f2208b9a11f608e7d726bf426fe4c2a672e058a.

Conflicts:
apps/files/admin.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 27 Dec 2012 23:20:34 +0000 (00:20 +0100)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 26 Dec 2012 23:05:17 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 25 Dec 2012 23:12:10 +0000 (00:12 +0100)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 24 Dec 2012 23:11:11 +0000 (00:11 +0100)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 23 Dec 2012 23:12:16 +0000 (00:12 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #845 from owncloud/sqlite_error
Frank Karlitschek [Sat, 22 Dec 2012 23:22:09 +0000 (15:22 -0800)]
Merge pull request #845 from owncloud/sqlite_error

Try to fix #836

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Dec 2012 23:10:23 +0000 (00:10 +0100)]
[tx-robot] updated from transifex

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 21 Dec 2012 23:26:25 +0000 (00:26 +0100)]
[tx-robot] updated from transifex

11 years agomoving logic from template to the 'controller'
Thomas Müller [Thu, 20 Dec 2012 23:48:12 +0000 (00:48 +0100)]
moving logic from template to the 'controller'
THX @VicDeo

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 20 Dec 2012 23:11:31 +0000 (00:11 +0100)]
[tx-robot] updated from transifex

11 years agofixing variable name
Thomas Müller [Thu, 20 Dec 2012 23:04:46 +0000 (00:04 +0100)]
fixing variable name

11 years agoMerge pull request #978 from owncloud/logout-icon
Michael Gapczynski [Thu, 20 Dec 2012 22:51:36 +0000 (14:51 -0800)]
Merge pull request #978 from owncloud/logout-icon

fix logout icon, hopefully also #969

11 years agoMerge pull request #935 from owncloud/ignore_autogenerated_testfiles
Bart Visscher [Thu, 20 Dec 2012 15:25:57 +0000 (07:25 -0800)]
Merge pull request #935 from owncloud/ignore_autogenerated_testfiles

ignore autogenerated testfiles and folders

11 years agoremove unused code
Thomas Müller [Thu, 20 Dec 2012 14:45:10 +0000 (15:45 +0100)]
remove unused code

11 years agoenable translations for quota sizes 'none' and 'default'
Thomas Müller [Thu, 20 Dec 2012 14:35:36 +0000 (15:35 +0100)]
enable translations for quota sizes 'none' and 'default'

11 years agoMerge pull request #869 from owncloud/files-styles
Jan-Christoph Borchardt [Thu, 20 Dec 2012 13:39:09 +0000 (05:39 -0800)]
Merge pull request #869 from owncloud/files-styles

Files styles

11 years agofix logout icon, hopefully also #969
Jan-Christoph Borchardt [Thu, 20 Dec 2012 12:49:43 +0000 (13:49 +0100)]
fix logout icon, hopefully also #969

11 years agofix switched values from previous commit
Jan-Christoph Borchardt [Thu, 20 Dec 2012 12:30:57 +0000 (13:30 +0100)]
fix switched values from previous commit

11 years agoMerge pull request #970 from owncloud/fixing-950-master
Jan-Christoph Borchardt [Thu, 20 Dec 2012 12:15:51 +0000 (04:15 -0800)]
Merge pull request #970 from owncloud/fixing-950-master

within the user administratio page some translations have been missing

11 years agoMerge pull request #974 from owncloud/fixing-120-master
Jan-Christoph Borchardt [Thu, 20 Dec 2012 12:02:22 +0000 (04:02 -0800)]
Merge pull request #974 from owncloud/fixing-120-master

setting the timezone is now part of the login process

11 years agoMerge pull request #925 from owncloud/fix_issue_918
Bart Visscher [Thu, 20 Dec 2012 11:30:50 +0000 (03:30 -0800)]
Merge pull request #925 from owncloud/fix_issue_918

Trigger the last action before continuing with a file upload

11 years agoMerge pull request #914 from owncloud/incorporate-qa-tools-used-by-ci
Bart Visscher [Thu, 20 Dec 2012 11:06:26 +0000 (03:06 -0800)]
Merge pull request #914 from owncloud/incorporate-qa-tools-used-by-ci

Migration of build files from Jenkins

11 years agofix Firefox issues with file actions position and multiselect bar width
Jan-Christoph Borchardt [Thu, 20 Dec 2012 11:02:19 +0000 (12:02 +0100)]
fix Firefox issues with file actions position and multiselect bar width

11 years agoUpdate lib/util.php
irgsmirx [Thu, 20 Dec 2012 11:01:11 +0000 (12:01 +0100)]
Update lib/util.php

getUrlContent should take proxy setting into consideration when not using curl, as well

11 years agouse slightly darker color for file actions background, fix fugly look for selected...
Jan-Christoph Borchardt [Thu, 20 Dec 2012 10:24:25 +0000 (11:24 +0100)]
use slightly darker color for file actions background, fix fugly look for selected rows

11 years agofix file actions messing with file row height on narrower screens
Jan-Christoph Borchardt [Thu, 20 Dec 2012 10:14:27 +0000 (11:14 +0100)]
fix file actions messing with file row height on narrower screens

11 years agoremove timezone.js
Thomas Müller [Thu, 20 Dec 2012 10:14:21 +0000 (11:14 +0100)]
remove timezone.js

11 years agosetting the timezone is now part of the login process and true part of the core.
Thomas Müller [Thu, 20 Dec 2012 10:10:45 +0000 (11:10 +0100)]
setting the timezone is now part of the login process and true part of the core.

11 years agomove CSS from JS to CSS
Jan-Christoph Borchardt [Thu, 20 Dec 2012 09:53:50 +0000 (10:53 +0100)]
move CSS from JS to CSS

11 years agoadding missing translations for various strings + fixing tool tip on delete
Thomas Müller [Thu, 20 Dec 2012 08:59:09 +0000 (09:59 +0100)]
adding missing translations for various strings + fixing tool tip on delete

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 19 Dec 2012 23:13:09 +0000 (00:13 +0100)]
[tx-robot] updated from transifex

11 years ago[l18n] fixing typos in source text
Thomas Müller [Wed, 19 Dec 2012 22:43:07 +0000 (23:43 +0100)]
[l18n] fixing typos in source text

11 years agoMerge pull request #888 from owncloud/add_curl_proxy
Frank Karlitschek [Wed, 19 Dec 2012 18:02:18 +0000 (10:02 -0800)]
Merge pull request #888 from owncloud/add_curl_proxy

add curl proxy support.

11 years agoMerge branch 'add_curl_proxy' of https://github.com/owncloud/core into add_curl_proxy
Frank Karlitschek [Wed, 19 Dec 2012 17:51:09 +0000 (18:51 +0100)]
Merge branch 'add_curl_proxy' of https://github.com/owncloud/core into add_curl_proxy

11 years agocall it "proxy" instead of "curlproxy"
root [Fri, 14 Dec 2012 23:09:39 +0000 (00:09 +0100)]
call it "proxy" instead of "curlproxy"
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)

11 years agomake it more readable as deepdiver suggested
Frank Karlitschek [Fri, 14 Dec 2012 21:54:21 +0000 (22:54 +0100)]
make it more readable as deepdiver suggested

11 years agoadd curl proxy support. Fixes #504
Frank Karlitschek [Fri, 14 Dec 2012 17:52:16 +0000 (18:52 +0100)]
add curl proxy support. Fixes #504
https://github.com/owncloud/core/issues/504

11 years agoMerge pull request #961 from owncloud/check_locale
Frank Karlitschek [Wed, 19 Dec 2012 16:53:43 +0000 (08:53 -0800)]
Merge pull request #961 from owncloud/check_locale

add a check and a warning if setlocale is working

11 years agoMerge pull request #868 from owncloud/new_doc_system
Frank Karlitschek [Wed, 19 Dec 2012 14:40:37 +0000 (06:40 -0800)]
Merge pull request #868 from owncloud/new_doc_system

New doc system

11 years agoadd a check and a warning if setlocale is working
Frank Karlitschek [Wed, 19 Dec 2012 14:10:33 +0000 (15:10 +0100)]
add a check and a warning if setlocale is working

11 years agoMerge pull request #954 from owncloud/download-progress-master
Thomas Müller [Wed, 19 Dec 2012 12:19:57 +0000 (04:19 -0800)]
Merge pull request #954 from owncloud/download-progress-master

refs #933 send content length header - this will allow the browser to sh...

11 years agorefs #933 send content length header - this will allow the browser to show the progre...
Thomas Mueller [Wed, 19 Dec 2012 10:22:01 +0000 (11:22 +0100)]
refs #933 send content length header - this will allow the browser to show the progressbar

11 years agoMerge pull request #949 from RandolfCarter/InvalidDefaultAddress
Thomas Müller [Wed, 19 Dec 2012 08:33:53 +0000 (00:33 -0800)]
Merge pull request #949 from RandolfCarter/InvalidDefaultAddress

Fixing default email sender address

11 years agofixes default email sender address
Randolph Carter [Wed, 19 Dec 2012 00:09:14 +0000 (01:09 +0100)]
fixes default email sender address

11 years agoMerge pull request #913 from owncloud/fix_settings
Frank Karlitschek [Tue, 18 Dec 2012 23:27:52 +0000 (15:27 -0800)]
Merge pull request #913 from owncloud/fix_settings

cleaning up the settings

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 18 Dec 2012 23:04:14 +0000 (00:04 +0100)]
[tx-robot] updated from transifex

11 years agoignore autogenerated testfiles and folders
Jörn Friedrich Dreyer [Tue, 18 Dec 2012 14:57:42 +0000 (15:57 +0100)]
ignore autogenerated testfiles and folders

11 years agocall the password input field by name
Björn Schießle [Fri, 14 Dec 2012 12:25:57 +0000 (13:25 +0100)]
call the password input field by name

11 years agoautofocus to password input after clicking the checkbox; code restructured; debug...
Björn Schießle [Fri, 14 Dec 2012 12:13:01 +0000 (13:13 +0100)]
autofocus to password input after clicking the checkbox; code restructured; debug output added

11 years agosome more usability improvements:
Björn Schießle [Wed, 5 Dec 2012 13:17:21 +0000 (14:17 +0100)]
some more usability improvements:

merged pull request https://github.com/owncloud/core/pull/121 into this patch with fixes for all issues mentioned in 121

11 years agoset password for shared links when the user press enter and when he leaves the passwo...
Björn Schießle [Tue, 4 Dec 2012 13:06:44 +0000 (14:06 +0100)]
set password for shared links when the user press enter and when he leaves the password field

11 years agoMerge pull request #905 from owncloud/fix_mountpointescaping
Thomas Müller [Tue, 18 Dec 2012 12:01:07 +0000 (04:01 -0800)]
Merge pull request #905 from owncloud/fix_mountpointescaping

proper escape the mountpoints.

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 17 Dec 2012 23:14:58 +0000 (00:14 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #929 from owncloud/fix_utf8_filenames_in_ie_download
Thomas Müller [Mon, 17 Dec 2012 22:53:15 +0000 (14:53 -0800)]
Merge pull request #929 from owncloud/fix_utf8_filenames_in_ie_download

fix utf8 filenames in ie download response header according to rfc5987, ...

11 years agofix utf8 filenames in ie download response header according to rfc5987, see http...
Jörn Friedrich Dreyer [Mon, 17 Dec 2012 15:23:12 +0000 (16:23 +0100)]
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

11 years agoMerge pull request #842 from owncloud/restrict_keyboard_shortcuts
Thomas Müller [Mon, 17 Dec 2012 15:38:53 +0000 (07:38 -0800)]
Merge pull request #842 from owncloud/restrict_keyboard_shortcuts

prevent keyboardshortcuts from catching events outside the main doc - e....

11 years agoMerge pull request #928 from owncloud/fix_permissioncheck
Lukas Reschke [Mon, 17 Dec 2012 13:55:15 +0000 (05:55 -0800)]
Merge pull request #928 from owncloud/fix_permissioncheck

check if admin

11 years agocheck if admin
Frank Karlitschek [Mon, 17 Dec 2012 13:46:57 +0000 (14:46 +0100)]
check if admin