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

9393 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Jan-Christoph Borchardt
abb3635bd8 gitignore Cloud9IDE system folder 2013-02-06 18:27:04 +01:00
Jan-Christoph Borchardt
4c406c9ab1 fix shorttag issue mentioned in #1357 2013-02-06 18:19:26 +01:00
Thomas Müller
81792448ae Merge pull request #1472 from owncloud/files_versions-cleanup 
files_versions cleanup
 2013-02-06 08:53:20 -08:00
Frank Karlitschek
7d0b4c2581 Merge pull request #1438 from owncloud/phpunit-tests-win32-master 
PHPUnit support for Windows added
 2013-02-06 08:40:53 -08:00
Jan-Christoph Borchardt
2130262515 Merge pull request #1459 from owncloud/infield-detail 
shift infield labels just a tiny bit to the right so the cursor doesn't ...
 2013-02-06 08:23:53 -08:00
Thomas Tanghus
3879e5d9c5 Merge pull request #1428 from owncloud/content_positioning 
Fix leftcontent positioning. Ref #1255
 2013-02-06 08:13:45 -08:00
Thomas Tanghus
2d77c7c0fd Reduce top position for content below controls. 2013-02-06 16:56:26 +01:00
Björn Schießle
fd171a4f34 copy&paste bug, no fetchAll() needed here 2013-02-06 16:50:16 +01:00
Jan-Christoph Borchardt
09a4424b1f Merge pull request #1497 from owncloud/collapse-usermenu 
collapse user menu when inside one of the settings sections
 2013-02-06 07:33:59 -08:00
Jan-Christoph Borchardt
5f84f4b4fd Merge pull request #1496 from owncloud/custom_clients 
make it possible to modify the links to the clients
 2013-02-06 07:25:16 -08:00
Björn Schießle
8cc7bab0e5 delete debug code 2013-02-06 16:25:10 +01:00
Björn Schießle
e2516a2b65 allow to delete single files from the trash bin permanently 2013-02-06 16:23:22 +01:00
Jan-Christoph Borchardt
8ea6398e48 collapse user menu when inside one of the settings sections 2013-02-06 16:03:01 +01:00
Thomas Müller
efdaea4557 Merge pull request #1357 from owncloud/alternative-loging-master 
add support for apps to register alternative login methods
 2013-02-06 06:49:58 -08:00
Thomas Müller
58a3a6a573 Merge pull request #1487 from owncloud/fix-1420-master 
Replace OC_FileCache usage in files_versions
 2013-02-06 06:45:01 -08:00
Georg Ehrke
0a16d25724 make it possible to modify the links to the clients 2013-02-06 15:20:43 +01:00
Jan-Christoph Borchardt
964ff88f71 move inline style to CSS file, fix details 2013-02-06 15:15:20 +01:00
Björn Schießle
9e08f85c5e port already approved bugfix to master, https://github.com/owncloud/core/pull/1479 2013-02-06 14:19:32 +01:00
Björn Schießle
2fdf8ff3e7 Merge pull request #1490 from schiesbn/user_displayname 
let the user change his display name, if supported by the back-end
 2013-02-06 02:56:01 -08:00
Björn Schießle
e68d0c7398 make strings translatable 2013-02-06 11:55:19 +01:00
Björn Schießle
9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Bart Visscher
0e548283fc Replace OC_FileCache usage in files_versions 2013-02-06 08:00:57 +01:00
Jenkins for ownCloud
335b6cd060 [tx-robot] updated from transifex 2013-02-06 00:06:28 +01:00
Thomas Müller
74157902d7 Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit 
disable error handler while running phpunit
 2013-02-05 14:35:11 -08:00
Thomas Mueller
cbf6b28f45 uncomment failing calls to \OC\Files\Filesystem::file_put_contents 2013-02-05 20:21:29 +01:00
Thomas Mueller
c0263173d2 add phpunit configuration for autotest withou the json listener because this pollutes the console 2013-02-05 20:20:55 +01:00
Thomas Mueller
10ea45c916 fix failing test cases due to wrong typing 2013-02-05 20:19:54 +01:00
Arthur Schiwon
5221ee0c5a offer change password only when the action is supported by the user backend 2013-02-05 19:26:00 +01:00
Lukas Reschke
e6400b3059 Merge pull request #1474 from samtuke/master 
Improvements to files_encryption
 2013-02-05 09:58:35 -08:00
Sam Tuke
20b1d12cbf Fixed comment typo, wrapped return value conditional on var assignment in session{} 2013-02-05 17:28:26 +00:00
Sam Tuke
4ba0ab7f65 Added missing translation wrapping 2013-02-05 17:22:59 +00:00
Sam Tuke
b84e83261e Added notice to personal settings indicating what filetypes are not encrypted 2013-02-05 17:06:15 +00:00
Bart Visscher
3e7ca373ec Only calculate md5 of local file once 2013-02-05 17:56:51 +01:00
Bart Visscher
148e4facfa Change files_versions namespace to OCA\Files_Versions 2013-02-05 17:46:39 +01:00
Sam Tuke
680c5b3dad Removed debugging output 2013-02-05 16:11:50 +00:00
Sam Tuke
221b69dd0e Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption 2013-02-05 16:09:01 +00:00
Michael Gapczynski
69fd3f42e5 Merge pull request #1471 from owncloud/temp-storage-call-parent-ctor-master 
Temp storage call parent ctor master
 2013-02-05 08:03:18 -08:00
Sam Tuke
a1f200c1e5 Cleaned up path formatting with new method stripUserFilesPath() 2013-02-05 15:59:28 +00:00
Thomas Mueller
77369d8164 disable error handler while running phpunit 2013-02-05 16:44:02 +01:00
Sam Tuke
50faddfa40 Minor improvement to comments 2013-02-05 15:37:40 +00:00
Sam Tuke
53248a9b60 Recryption of legacy encrypted files now working on login 2013-02-05 15:35:29 +00:00
Thomas Mueller
9446017821 spell check 2013-02-05 16:24:40 +01:00
Thomas Mueller
1fd807a7d6 pass the argument to the ctor 
Conflicts:
	lib/files/storage/temporary.php
 2013-02-05 16:24:11 +01:00
Bart Visscher
86f4126d2c Merge pull request #1469 from owncloud/no-setlocale-on-windows 
No setlocale on windows
 2013-02-05 07:16:14 -08:00
Michael Gapczynski
79e6e579e3 Merge pull request #1452 from owncloud/fix-breadcrumb 
Remove undefined crumb variable from home breadcrumb
 2013-02-05 06:56:15 -08:00
Thomas Mueller
ac11c842e6 setlocale test is pointless on Windows 2013-02-05 15:46:55 +01:00