mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,101 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

8101 Commits

Author SHA1 Message Date
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
Arthur Schiwon 72d67ec036 Switch to textarea to enable configuration of multiple DNs 2013-01-03 14:07:01 +01:00
Arthur Schiwon 959996c3b4 LDAP: fix spelling 2013-01-03 12:32:42 +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
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 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
Robin Appelman 54f6f1e6b7 phpdoc fixes for public api 2013-01-02 16:38:20 +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
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
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
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
Frank Karlitschek 15da11effe Merge pull request #845 from owncloud/sqlite_error 
Try to fix #836
 2012-12-22 15:22:09 -08: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
Thomas Müller 7e78f8e15a moving logic from template to the 'controller' 
THX @VicDeo
 2012-12-21 00:48:12 +01:00
Jenkins for ownCloud 3e39c39d6a [tx-robot] updated from transifex 2012-12-21 00:11:31 +01:00
Thomas Müller 986f5d9f3e fixing variable name 2012-12-21 00:04:58 +01:00
Michael Gapczynski 84ba66e9b7 Merge pull request #978 from owncloud/logout-icon 
fix logout icon, hopefully also #969
 2012-12-20 14:51:36 -08:00
Bart Visscher 5fb4ed2d92 Merge pull request #935 from owncloud/ignore_autogenerated_testfiles 
ignore autogenerated testfiles and folders
 2012-12-20 07:25:57 -08:00
Thomas Müller 24e0a2a358 remove unused code 2012-12-20 15:45:10 +01:00
Thomas Müller 436df6b67d enable translations for quota sizes 'none' and 'default' 2012-12-20 15:35:36 +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 1cbd04a2c4 fix logout icon, hopefully also #969 2012-12-20 13:49:43 +01:00
Jan-Christoph Borchardt 86d510ba28 fix switched values from previous commit 2012-12-20 13:30:57 +01:00
Jan-Christoph Borchardt 31aa317952 Merge pull request #970 from owncloud/fixing-950-master 
within the user administratio page some translations have been missing
 2012-12-20 04:15:51 -08: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
Bart Visscher fb6b03e922 Merge pull request #914 from owncloud/incorporate-qa-tools-used-by-ci 
Migration of build files from Jenkins
 2012-12-20 03:06:26 -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
irgsmirx 1e3231c732 Update lib/util.php 
getUrlContent should take proxy setting into consideration when not using curl, as well
 2012-12-20 12:01:11 +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