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

10228 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bernhard Posselt
f415f3e03e return true once one owncloud version number is bigger at any position 2013-02-25 23:06:26 +01:00
Lukas Reschke
d713948d3f Merge pull request #1898 from owncloud/session_start_fix 
set http 500 when session could not be started to prevent serving of emp...
 2013-02-25 14:00:12 -08:00
Bernhard Posselt
b537cecdf3 add CSP turned on for angularjs 2013-02-25 22:54:05 +01:00
Lukas Reschke
6735701c1e Merge pull request #1837 from owncloud/fix-user-template 
Remove unneeded code for user layout template
 2013-02-25 13:41:32 -08:00
Lukas Reschke
a2a1e8c2cb Merge pull request #1839 from owncloud/no_recursive_object_walking 
Don't walk objects with array_walk_recursive()
 2013-02-25 12:53:23 -08:00
Thomas Müller
6dd1d479da Merge pull request #1706 from owncloud/master-sqlserver 
Microsoft SQL-Server support for ownCloud!
 2013-02-25 12:50:32 -08:00
Qingping Hou
c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Frank Karlitschek
a533bb6dcd 5 beta 2 2013-02-25 20:00:40 +01:00
Bernhard Posselt
7f7b8bc07a use error template 2013-02-25 19:17:29 +01:00
Frank Karlitschek
571f1e2d2b Merge pull request #1894 from owncloud/texfix 
fixed bug that prevented a newly created file to be opened with register...
 2013-02-25 09:48:25 -08:00
Bernhard Posselt
aba60dba28 added simple error message for the browser 2013-02-25 18:47:34 +01:00
Bernhard Posselt
bc2fefed59 write an error log when session could not be initialized 2013-02-25 18:42:09 +01:00
Bernhard Posselt
55c72617c6 set http 500 when session could not be started to prevent serving of empty files see #1049 2013-02-25 18:37:05 +01:00
Bernhard Posselt
1d83d76b45 fixed bug that prevented a newly created file to be opened with registered files actions 2013-02-25 17:50:17 +01:00
Bernhard Posselt
946a064fc6 Merge pull request #1891 from owncloud/set_timeout 
use a 5 sec timeout for the webdav check
 2013-02-25 08:27:20 -08:00
Frank Karlitschek
f50be25704 Merge pull request #1864 from owncloud/fix_display_default 
LDAP: simplify default for user home settings, fixes wrong display of de...
 2013-02-25 08:23:32 -08:00
Björn Schießle
ede0e7d6bc Merge pull request #1890 from owncloud/trashbin_fix 
fix quota calculation for trash bin and versions
 2013-02-25 07:59:09 -08:00
Björn Schießle
3ef8c0bda3 Merge pull request #1892 from owncloud/files_remove_row_on_delete 
delete table row if file was deleted instead of just hide it
 2013-02-25 07:44:35 -08:00
Thomas Müller
638de02be4 Merge pull request #1889 from owncloud/use_distance_option 
use distance option to delay dragging in sane browsers
 2013-02-25 07:33:11 -08:00
Björn Schießle
dbf2bfc8cd delete table row if file was deleted instead of just hide it 2013-02-25 16:32:54 +01:00
Frank Karlitschek
3009b43e3d use a 5 sec timeout for the webdav check 2013-02-25 16:30:11 +01:00
Björn Schießle
b917646516 fix quota calculation 2013-02-25 16:12:44 +01:00
Björn Schießle
2954c7e97a Merge pull request #1865 from owncloud/fix-displaying-db-errors 
Don't use routes when displaying error page
 2013-02-25 07:09:48 -08:00
Björn Schießle
272f854ce6 fix getVersion call 2013-02-25 15:34:36 +01:00
Jörn Friedrich Dreyer
664e7a3fc2 use distance option to delay dragging in sane browsers 2013-02-25 15:08:14 +01:00
Björn Schießle
0f763f4508 Merge pull request #1823 from owncloud/update-expire-function 
Update expire function
 2013-02-25 05:30:21 -08:00
Björn Schießle
e30b3f64e0 fix line endings 2013-02-25 14:29:31 +01:00
Björn Schießle
4c980a4851 Merge branch 'master' into update-expire-function 
Conflicts:
	apps/files_trashbin/appinfo/version
	apps/files_trashbin/lib/trash.php
 2013-02-25 14:26:59 +01:00
Björn Schießle
a37577e007 Merge pull request #1810 from owncloud/trashbin_encryption 
Trashbin file encryption support
 2013-02-25 05:13:38 -08:00
Björn Schießle
7da97550df some final code clean-up 2013-02-25 14:12:56 +01:00
Björn Schießle
7ebbecd81f always use "===" 2013-02-25 14:09:20 +01:00
Bernhard Posselt
3f48bebe92 Merge pull request #1827 from owncloud/fix_getVersions 
fix getVersions(), we need to get the correct user and filename
 2013-02-25 04:59:47 -08:00
Thomas Müller
660670ec68 Merge pull request #1832 from owncloud/fix_1779 
use :hover pseudo class to set opacity
 2013-02-25 04:35:34 -08:00
Thomas Müller
7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465 
Fix 1465
 2013-02-25 04:34:13 -08:00
Bart Visscher
9ceae51091 Merge pull request #1887 from owncloud/fixing-1843-master 
remove the check for session data folder - causes trouble on some enviro...
 2013-02-25 04:16:38 -08:00
Björn Schießle
da82f7f5f3 Merge pull request #1888 from Raydiation/master 
Fixes apps require version checking
 2013-02-25 03:57:29 -08:00
Bernhard Posselt
8068051ca4 more tests to fail the version check 2013-02-25 12:47:34 +01:00
Bernhard Posselt
5bf3d286f0 created unittests and factored out version test into seperate method 2013-02-25 12:38:00 +01:00
Björn Schießle
4dea6a6228 Merge branch 'master' into trashbin_encryption 
Conflicts:
	apps/files_trashbin/index.php
	apps/files_trashbin/lib/trash.php
 2013-02-25 12:14:51 +01:00
Bernhard Posselt
ecd40f0abc spaces to tabs 2013-02-25 11:40:55 +01:00
Bernhard Posselt
736d5deaee version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version 2013-02-25 11:39:55 +01:00
Björn Schießle
632ca9f06d Merge branch 'master' into update-expire-function 
Conflicts:
	apps/files_trashbin/lib/trash.php
 2013-02-25 11:14:06 +01:00
Frank Karlitschek
9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy 
don't use the number of written bytes as indicator if streamCopy() was successful
 2013-02-25 02:04:12 -08:00
Thomas Mueller
ebcb778a99 remove the check for session data folder - causes trouble on some environments 
let's try to find another solution for =C6
 2013-02-25 10:12:47 +01:00
Frank Karlitschek
8f65916904 Merge pull request #1882 from owncloud/required_version 
Set required owncloud version to 4.93
 2013-02-25 00:37:22 -08:00
Qingping Hou
278a6f5b41 update oldDisplayName value on displayName change 
This patch fixes a bug that can be reproduced in following way:

1. change displayName
2. clear text in displayName input click change again

Then you will get an error and previous displayName will be restored.

Expected behavior should restore the new updated displayName.
 2013-02-24 18:13:25 -05:00
Qingping Hou
2f3c5d8afc when user changes displayName, also update it on expand button 2013-02-24 18:07:35 -05:00
Jenkins for ownCloud
21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Thomas Müller
906f8fa6f6 Merge pull request #1881 from owncloud/safemode_check 
add a safe_mode check
 2013-02-24 11:23:27 -08:00
Robin Appelman
4e826b1673 Set required owncloud version to 4.93 2013-02-24 17:38:36 +01:00