mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,117 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

10117 Commits

Author SHA1 Message Date
Bernhard Posselt 18b7a2bf21 add css and scripts before session init 2013-02-27 11:17:14 +01:00
Jan-Christoph Borchardt 86ffa28f72 quick fix for log in button not being aligned with input fields 2013-02-27 11:04:08 +01:00
Björn Schießle 5c7e3cf2e2 escape regular expressions; fix typo in variable name 2013-02-27 10:51:32 +01:00
Michael Gapczynski f26c477433 Merge pull request #1949 from owncloud/fix-dropbox 
Fix undefined root parameter in Dropbox storage
 2013-02-26 16:14:45 -08:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Michael Gapczynski 25cf18f614 Fix undefined root parameter in Dropbox storage 2013-02-26 17:52:06 -05:00
Arthur Schiwon 60d4fdda57 sort users according to display name 2013-02-26 22:56:55 +01:00
Robin Appelman 47b899e0c8 Disable prepared query caching while doing an upgrade 2013-02-26 22:41:48 +01:00
Arthur Schiwon 64551ee06f LDAP: sort users on server-side 2013-02-26 22:27:09 +01:00
Thomas Müller f3a8bf9260 Merge pull request #1931 from owncloud/fastcgi 
add cgi pathinfo when fcgi is enabled #1189
 2013-02-26 12:40:12 -08:00
Thomas Müller f1dc46b4e0 Merge pull request #1942 from owncloud/fix-1925-wrong-quotes 
Fix using wrong quotes for breaking long lines
 2013-02-26 12:37:23 -08:00
Thomas Müller 5572c3a761 Merge pull request #1929 from owncloud/htaccess-utf8 
added defaultcharset to utf-8 in htaccess
 2013-02-26 12:34:12 -08:00
Bart Visscher aa8bf3bbaa Merge pull request #1941 from owncloud/session_heartbeat 
generate url only once for heartbeat
 2013-02-26 11:49:59 -08:00
Bart Visscher 4a26d63867 Fix using wrong quotes for breaking long lines 
Fixes #1925
 2013-02-26 20:48:01 +01:00
Bernhard Posselt a65b16f3e7 generate url only once 2013-02-26 20:45:25 +01:00
Lukas Reschke d3aecdab09 Merge pull request #1939 from owncloud/session_heartbeat 
use 15 min instead of 15 sec timeout
 2013-02-26 11:28:15 -08:00
Bernhard Posselt 81bb4363a2 use 15 min instead of 15 sec timeout 2013-02-26 20:25:07 +01:00
Frank Karlitschek 7eec31567f Merge pull request #1938 from owncloud/session_heartbeat 
implemented a heartbeat request which is calls the server every 15 minut...
 2013-02-26 11:02:09 -08:00
Bernhard Posselt 4e55348054 implemented a heartbeat request which is calls the server every 15 minutes to prevent a session timeout 2013-02-26 19:34:46 +01:00
Jan-Christoph Borchardt 07e9f8d0d3 remove general CSS from IE specific rules, displays Shared state permanently again 2013-02-26 18:49:20 +01:00
Bernhard Posselt 26d5992161 add cgi pathinfo when fcgi is enabled #1189 2013-02-26 18:00:07 +01:00
Bernhard Posselt 023f19e929 added defaultcharset to utf-8 in htaccess 2013-02-26 17:38:59 +01:00
Lukas Reschke 81c664697b Merge pull request #1920 from owncloud/catch_vcategories_exceptions 
Catch exceptions on malformed categories.
 2013-02-26 07:34:46 -08:00
Thomas Müller a148e6de40 Merge pull request #1922 from owncloud/missing_ 
Add missing echo
 2013-02-26 07:33:15 -08:00
Lukas Reschke c94974cb97 Add missing echo 2013-02-26 16:10:52 +01:00
Frank Karlitschek 1591b2f8d0 Merge pull request #1915 from owncloud/fix_webdav_mount 
cleanPath needs to be public
 2013-02-26 06:20:58 -08:00
Frank Karlitschek 5e07c30f4b Merge pull request #1919 from owncloud/logo-pixelperfect 
Logo pixel perfect
 2013-02-26 06:16:42 -08:00
Thomas Tanghus ea841e5e15 Catch exceptions on malformed categories. 2013-02-26 15:01:42 +01:00
Jan-Christoph Borchardt 6f09f57008 remove more unused logo files, now in promo 2013-02-26 14:28:17 +01:00
Jan-Christoph Borchardt 7a47786afd align logo type pixel perfectly 2013-02-26 14:27:29 +01:00
Björn Schießle 8c9d0d1f5b cleanPath needs to be public 2013-02-26 12:24:52 +01:00
Frank Karlitschek 69eb69be0e Merge pull request #1902 from owncloud/angularcsp 
add CSP turned on for angularjs
 2013-02-26 00:58:12 -08:00
Bernhard Posselt b987c76d16 Merge pull request #1906 from owncloud/storage-stat-fail 
Common storage: don't throw warning when a stat fails
 2013-02-26 00:44:42 -08:00
Bernhard Posselt 5b250afafc Merge pull request #1903 from owncloud/fix_version_check 
return true once one owncloud version number is bigger at any position
 2013-02-26 00:37:11 -08:00
Frank Karlitschek 072daf8850 Merge pull request #1885 from houqp/issue_1776 
when user changes displayName, also update it on expand button
 2013-02-26 00:19:42 -08:00
Robin Appelman 52dccd4aa1 Storage: don't throw warnings when a stat fails 2013-02-26 02:53:02 +01:00
Michael Gapczynski 5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Robin Appelman 6b33a23a51 Code style 2013-02-26 02:51:57 +01:00
Michael Gapczynski aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
Michael Gapczynski 5b50bc8c0a Fix Dropbox and Google ui 2013-02-25 19:45:01 -05:00
Jenkins for ownCloud 63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Michael Gapczynski 4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Qingping Hou 02da5d5d52 remove Gwr 2013-02-25 17:22:04 -05:00
Qingping Hou 7e3a8c1dde use text method instead of html method 2013-02-25 17:18:20 -05:00
Qingping Hou 195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776 
Conflicts:
	core/templates/layout.user.php
 2013-02-25 17:16:03 -05:00
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