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

9505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bart Visscher
a93282ab16 Merge pull request #1507 from tripflex/master 
remove float left from actions div class

fixes #1504
 2013-02-07 12:49:14 -08:00
Lukas Reschke
c0154558c7 Merge pull request #1526 from owncloud/l10n-support-master 
L10n support master
 2013-02-07 12:38:36 -08:00
Bart Visscher
a82d18d2f8 Fill oc_webroot with the expected value 2013-02-07 21:13:57 +01:00
blizzz
fc7230349b Merge pull request #1530 from owncloud/fix-warning-displayname-layout 
Fix warning with displayname in user layout template
 2013-02-07 11:25:33 -08:00
blizzz
07f504812c Merge pull request #1531 from owncloud/cron_no_routes 
Fix router warnings when running as CLI
 2013-02-07 11:22:58 -08:00
Robin Appelman
73ed62976d Fix previous commit 2013-02-07 18:30:01 +01:00
Robin Appelman
f3f55654ce Use dummy request method in CLI 2013-02-07 18:28:56 +01:00
Jan-Christoph Borchardt
8ca730f4c1 make show password toggle work for installation (once #1525 is fixed) 2013-02-07 18:07:38 +01:00
Bart Visscher
20b6cb28b1 Fix warning with displayname in user layout template 2013-02-07 18:07:27 +01:00
Robin Appelman
afa1a6d2b3 Don't try to use routes when called from cli 2013-02-07 17:53:38 +01:00
Jörn Friedrich Dreyer
1ef3e4c5c6 simplyfy mimetype parsing of 'file' output 2013-02-07 17:46:16 +01:00
Jan-Christoph Borchardt
32e739f2ae make show password not specific to log in 2013-02-07 17:41:24 +01:00
Jan-Christoph Borchardt
ee6884e336 remove duplicate show password toggle code, move current one to proper location 2013-02-07 17:04:03 +01:00
Jan-Christoph Borchardt
ae7a80ede3 some comments for CSS documentation 2013-02-07 17:02:43 +01:00
Jan-Christoph Borchardt
867dc8e6dc fix database labels having left padding 2013-02-07 16:57:54 +01:00
Thomas Mueller
5f92d269dc l10n support enhanced in core 2013-02-07 16:49:36 +01:00
Thomas Mueller
e0212c1174 l10n support enhanced in files_versions 2013-02-07 16:34:57 +01:00
Thomas Mueller
18a288a3c3 l10n support enhanced in files_trashbin 2013-02-07 16:31:04 +01:00
Thomas Mueller
488ab0dba2 l10n support enhanced in files_version 2013-02-07 16:17:54 +01:00
blizzz
6cff5418a7 Merge pull request #1524 from owncloud/fix_ldaps_tls_setting 
LDAP: don't try to put TLS on top of already secure connection (will fail).
 2013-02-07 07:06:35 -08:00
Arthur Schiwon
15e383fd01 Typo 2013-02-07 16:05:45 +01:00
Thomas Müller
0efcf33e2f Merge pull request #1451 from eMerzh/fix_1065 
Add Redirect to getUrlContent fix #1065
 2013-02-07 06:27:58 -08:00
blizzz
6299704dfd Merge pull request #1518 from schiesbn/trash_layout_fix 
add class hascontrols to trash bin file table
 2013-02-07 04:40:51 -08:00
Björn Schießle
8e70763cec Merge pull request #1522 from schiesbn/trash_bin_fix 
OCA_Versions is now known as OCA\Files_Versions
 2013-02-07 04:38:22 -08:00
Björn Schießle
ce293b8efc remove debug output 2013-02-07 13:16:15 +01:00
Björn Schießle
7e874af2c8 rename OCA_Trash to OCA\Files_Trashbin 2013-02-07 13:14:45 +01:00
Björn Schießle
c81d7b0b90 OCA_Versions is now known as OCA\Files_Versions 2013-02-07 12:45:27 +01:00
Björn Schießle
c72537cd85 don't call the delete button unshare, unshare operation no longer available 2013-02-07 12:42:09 +01:00
Thomas Mueller
5788d36c8d Merge branch 'master' into fixing-1354-master 
Conflicts:
	settings/admin.php
	settings/templates/admin.php
 2013-02-07 10:44:28 +01:00
Björn Schießle
17384994d6 add class hascontrols to trash bin file table 2013-02-07 10:13:09 +01:00
Bart Visscher
458ba4b55c Fix disabling setup form on submit 2013-02-07 08:12:09 +01:00
Bart Visscher
c0b370f6cf Define the variables that are expected to exist but won't be set in setup 2013-02-07 08:11:18 +01:00
Bart Visscher
149d079fd4 Move loading of js_config to templatelayout 
Also check for installed flag because this isn't available before setup
 2013-02-07 08:09:53 +01:00
Thomas Mueller
84f3c8b6cc show webdav test results in admin section as well 2013-02-07 00:49:39 +01:00
Jenkins for ownCloud
35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Thomas Mueller
fd8cb9974b initial version of a local storage implementation which will use unique slugified filename on the local filesystem. 
This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.
 2013-02-06 23:41:52 +01:00
Frank Karlitschek
223f538bb8 Merge pull request #1500 from chriskoch/patch-1 
Update lib/public/util.php
 2013-02-06 13:00:10 -08:00
Lukas Reschke
2dfe67423d Merge pull request #1509 from owncloud/correct-public-contacts-tests 
Correct lib/public/contacts.php tests
 2013-02-06 12:29:51 -08:00
Lukas Reschke
e969a78cf9 Merge pull request #1443 from owncloud/use-module-file-info-master 
we get best results regarding mime type detection if we use fileinfo - l...
 2013-02-06 11:53:13 -08:00
Lukas Reschke
93b1597395 Merge pull request #1506 from owncloud/files_encryption 
Files encryption
 2013-02-06 11:47:55 -08:00
Lukas Reschke
e522872408 Merge pull request #1498 from schiesbn/delete_trash 
delete files from trash bin permanently
 2013-02-06 11:27:32 -08:00
Lukas Reschke
ad644b4e08 Merge pull request #1363 from owncloud/FixPasswordChange 
Fix password change
 2013-02-06 11:14:59 -08:00
Sam Tuke
2c22619a18 Reverted fix temporarily; another fix by LukasReschke is awaiting merge 2013-02-06 19:06:55 +00:00
Myles McNamara
ddd47978e1 Remove left float from actions div class 2013-02-06 13:44:41 -05:00
Sam Tuke
faf6cb0868 Merge branch 'master' into files_encryption 2013-02-06 18:26:44 +00:00
Sam Tuke
954a627483 Added comment 2013-02-06 18:24:35 +00:00
Thomas Müller
a26f17c130 Merge pull request #1502 from owncloud/gitignore-cloud9 
gitignore Cloud9IDE system folder
 2013-02-06 10:16:49 -08:00
Jan-Christoph Borchardt
8e006118fb Merge pull request #1501 from owncloud/fix-shorttag 
fix shorttag issue mentioned in #1357
 2013-02-06 10:01:40 -08:00
Sam Tuke
2b07afc8ab Removed debugging code 2013-02-06 17:59:47 +00:00
Sam Tuke
ae8cfe6569 Added comments 2013-02-06 17:43:03 +00:00