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

13297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
4f462e9b6f Add trailing comma for all touched array lines. 2013-08-17 23:39:26 +02:00
Andreas Fischer
d38929fb10 Fix spacing of all touched lines. 2013-08-17 23:38:26 +02:00
Thomas Müller
15c9a0f405 fixing undefined js error 2013-08-17 19:24:06 +02:00
Thomas Müller
727a191021 update 3rdparty submodule - timepicker removed 2013-08-17 18:54:08 +02:00
Thomas Müller
e22a4aba47 update 3rdparty submodule 2013-08-17 18:47:41 +02:00
Thomas Müller
c5cea47ab2 3rdparty submodule update: getid3 removed 2013-08-17 18:37:45 +02:00
Thomas Müller
b82c8bf9e6 update 3rdparty - openid moved 2013-08-17 18:33:44 +02:00
Thomas Müller
7575186fa6 moving Dropbox and smb4php 3rdparty code over to the apps 2013-08-17 18:20:20 +02:00
Thomas Müller
b4cc79970d update 3rdparty submodule 2013-08-17 18:17:49 +02:00
Thomas Müller
12f4494de0 Merge pull request #4339 from owncloud/mimetype-defaults 
Add the option to provide templates for newly created files
 2013-08-17 08:42:49 -07:00
Arthur Schiwon
f41c4312ff LDAP: use memcache if available 2013-08-17 17:22:54 +02:00
Morris Jobke
6ae6dc00e5 Merge pull request #4427 from owncloud/fix_4425 
use OC files API to create missing directory
 2013-08-17 08:09:07 -07:00
Kondou
a1128aadd0 Merge pull request #4482 from owncloud/remove_cancel_button_filepicker 
Remove cancel button from filepicker
 2013-08-17 06:58:34 -07:00
Bjoern Schiessle
f28f528431 switched to dirname() 2013-08-17 13:49:42 +02:00
Bjoern Schiessle
db8fdd5032 added missing parameter documentation 2013-08-17 13:46:33 +02:00
Morris Jobke
3e88430840 Merge pull request #4475 from owncloud/brighter-font-color 
change font on login/install page from black to white
 2013-08-17 04:37:49 -07:00
Björn Schießle
1af2ec1724 Merge pull request #4481 from owncloud/fix_versioning_size_check 
first check if file exists before checking the files size
 2013-08-17 04:37:09 -07:00
Bjoern Schiessle
f71794f0d5 added createMissingDirectories() method 2013-08-17 13:28:35 +02:00
Bjoern Schiessle
cabe92ef12 Merge branch 'master' into decrypt_files_again 
Conflicts:
	apps/files_encryption/tests/keymanager.php
 2013-08-17 13:15:22 +02:00
Björn Schießle
d3e2f31ada Merge pull request #4352 from owncloud/encryption_clean_up 
crypt.php clean up
 2013-08-17 04:10:15 -07:00
Bart Visscher
29b6dd53a0 Compare result are already true/false 2013-08-17 12:58:10 +02:00
Arthur Schiwon
c538ac3081 LDAP: only connect to LDAP once on login 2013-08-17 12:16:51 +02:00
Thomas Müller
69350c4e0d Merge pull request #4471 from owncloud/password-icon 
use proper password icon, three dots are 'more'
 2013-08-17 03:16:11 -07:00
Thomas Müller
264ee9df9a Merge pull request #4476 from owncloud/doc-on-master 
fix difference between packaged version and master
 2013-08-17 03:13:17 -07:00
Thomas Müller
e761cba808 Merge pull request #4480 from owncloud/remove-ru_RU-master 
remove ru_RU - fixes #3135
 2013-08-17 03:10:42 -07:00
kondou
2ee8425295 Remove cancel button from filepicker 
Having the cancel button in the bottom right corner was a bit confusing.
It's useless anyways, since there's a X in the top right.
 2013-08-17 12:07:58 +02:00
Morris Jobke
50147bfbd1 Merge pull request #4193 from owncloud/versions_fix_css 
Versions fix css
 2013-08-17 03:01:24 -07:00
Bjoern Schiessle
16efd81a0e first check if file exists before checking the files size 2013-08-17 11:57:50 +02:00
Morris Jobke
60efd93d5d fixes for IE8 2013-08-17 11:56:52 +02:00
Thomas Müller
de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Bjoern Schiessle
137cd2ca89 increase width of versions dialog 2013-08-17 11:01:43 +02:00
Jan-Christoph Borchardt
7e4dcd268f vertically center rename input box 2013-08-17 10:46:03 +02:00
Morris Jobke
746d32eb05 fix difference between packaged version and master 2013-08-17 10:33:11 +02:00
Morris Jobke
18769e1348 change font on login/install page from black to white 2013-08-17 10:26:30 +02:00
Jan-Christoph Borchardt
b8b24bbae7 use proper password icon, three dots are 'more' 2013-08-16 17:59:48 +02:00
Georg Ehrke
164502477d use jQuery.get instead of jQuery.ajax 2013-08-16 17:25:38 +02:00
Robin Appelman
5c9aedac1b remove outdated quota proxy 2013-08-16 15:50:50 +02:00
Robin Appelman
8f10c9571f fix quota wrapper reporting negative free_space, breaking user interface 
return 0 instead
 2013-08-16 15:48:45 +02:00
Morris Jobke
837cefd8a3 Merge pull request #4442 from owncloud/no-smb-client-on-windows-master 
no files external for SMB on windows
 2013-08-16 02:48:42 -07:00
Jan-Christoph Borchardt
1e8849b04e Merge pull request #4314 from owncloud/css-fixes 
Design fixes
 2013-08-16 01:05:29 -07:00
Morris Jobke
c196985ea3 Merge pull request #4032 from owncloud/more-whitespace 
More whitespace
 2013-08-16 01:02:03 -07:00
Jenkins for ownCloud
6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Thomas Müller
0aa7dc9b89 tixing width and position of wider error messages 2013-08-16 00:56:09 +02:00
Jan-Christoph Borchardt
d2767faf61 Merge pull request #4113 from owncloud/delete-fix 
Delete icon fix
 2013-08-15 15:31:42 -07:00
Thomas Müller
57f7ff2dbd communicate size of newly created file back and update UI 2013-08-16 00:31:27 +02:00
Jan-Christoph Borchardt
399adf67b0 merge master into css-fixes 2013-08-16 00:29:43 +02:00
Thomas Müller
7279a07ca2 Merge branch 'master' into mimetype-defaults 
Conflicts:
	apps/files/ajax/newfile.php
 2013-08-16 00:13:10 +02:00
Jan-Christoph Borchardt
b632b8f4e4 force show loading icon also for IE 2013-08-16 00:02:11 +02:00
Jan-Christoph Borchardt
3563eecfff merge master into more-whitespace 2013-08-15 23:25:20 +02:00
Thomas Müller
bd1895bdf8 Merge pull request #4354 from owncloud/fix_2711_shared_icon_disappears_on_firefox 
fix #2711 using a custom event, also use css selectors over filterAttr
 2013-08-15 14:08:01 -07:00