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

10056 Commits

Author SHA1 Message Date
Björn Schießle 6cf147003f Merge branch 'master' into versions_cleanup 2013-02-27 15:50:08 +01:00
Björn Schießle 9b220d0b93 rename History to Versions 2013-02-27 15:46:49 +01:00
Björn Schießle d9e75c2b92 remove admin settings for versions 2013-02-27 15:44:02 +01:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Bart Visscher 3a7322342e Merge pull request #1956 from owncloud/session-error-format 
add styles before session init
 2013-02-27 05:21:17 -08:00
Bart Visscher a708b63402 Merge pull request #1961 from owncloud/trans_fix 
fixed bug that would cause a failure because of undefined variable  inst...
 2013-02-27 05:17:30 -08:00
Bernhard Posselt 49a0f42e3b fixed bug that would cause a failure because of undefined variable instead of %s in a translation string 2013-02-27 14:13:07 +01:00
Frank Karlitschek 49f2a2d25d Merge pull request #1953 from owncloud/escape_regular_expressions 
escape regular expressions; fix typo in variable name
 2013-02-27 04:29:17 -08:00
Bernhard Posselt a09076c3ac Merge pull request #1955 from owncloud/login-button-alignment 
quick fix for log in button not being aligned with input fields
 2013-02-27 04:05:47 -08:00
Björn Schießle f69fa2726c Merge pull request #1958 from owncloud/fixing-1933-master 
the locale name is no longer part of the translation string
 2013-02-27 03:15:03 -08:00
Bernhard Posselt 0828bb7e0e Merge pull request #1957 from owncloud/fix-895 
Fix 895
 2013-02-27 03:10:29 -08:00
Thomas Mueller c71fdf04d7 fixes 1933 - the locale name is no longer part of the translation string 2013-02-27 11:41:50 +01:00
Bernhard Posselt a54be4acc4 Merge pull request #1948 from owncloud/improve_user_sorting 
Sort after display name + LDAP server side sorting
 2013-02-27 02:39:22 -08:00
Bernhard Posselt a1afc2e34f only add style.css to initsession 2013-02-27 11:36:05 +01:00
Thomas Müller 58b06c5c9a Merge pull request #1905 from owncloud/fix-share-icons 
Fix adding share icons to share action
 2013-02-27 02:31:52 -08:00
Jan-Christoph Borchardt a5d84b74d0 properly align triangle and unshare icons to text, also fixes line hopping 2013-02-27 11:30:33 +01:00
Jan-Christoph Borchardt 7ee5b2df13 fix ugly giant triangles 2013-02-27 11:30:06 +01:00
Jan-Christoph Borchardt 49cd9f20a6 fix shared by text going out of box, fix #895 2013-02-27 11:22:13 +01:00
Jan-Christoph Borchardt f36d92bbc1 Merge pull request #1800 from raghunayyar/sharing-dropdown-fixes 
Various Layout Fixes for Sharing Dropdown.
 2013-02-27 02:19:35 -08:00
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
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