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

8254 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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