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

1549 Commits

Author SHA1 Message Date
Florian Hülsmann 0aa6c1b163 fixed header content padding 2013-03-07 19:28:17 +01:00
Frank Karlitschek 19073e0711 Merge pull request #2167 from owncloud/input-type-fix 
Input type fix
 2013-03-07 07:28:22 -08:00
Thomas Müller a2aebbd742 Merge pull request #2130 from owncloud/fix_2128 
fix #2128
 2013-03-06 05:05:40 -08:00
Georg Ehrke a83a5aa900 fix #2128 2013-03-06 13:02:44 +01:00
Lukas Reschke 630ee644db Don't sanitize error message hint 2013-03-06 12:56:27 +01:00
Jan-Christoph Borchardt 114c6457a3 add email input type to styled inputs, fix #2097 2013-03-06 12:38:43 +01:00
Michael Gapczynski 5300d6ad55 Clear the CSS and JS cache earlier to make sure update goes smoothly 2013-03-05 21:13:07 -05:00
Jenkins for ownCloud c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Lukas Reschke 76e6369ec1 Merge pull request #2077 from owncloud/oc_filepicker_inline_js 
Remove inline js from OC.Dialogs.FilePicker.
 2013-03-04 13:49:52 -08:00
Jan-Christoph Borchardt 07dee24cb2 explicitly add empty placeholder to inputs which use infield labels, fix #2049 2013-03-04 22:11:57 +01:00
Thomas Tanghus e9f46a7452 Remove inline js from OC.Dialogs.FilePicker. 2013-03-04 16:36:49 +01:00
Bernhard Posselt 841daf4845 Merge pull request #2062 from owncloud/shareType 
Sanitize shareWith
 2013-03-03 16:27:51 -08:00
Lukas Reschke 577945bd33 Sanitize shareWith 2013-03-04 00:54:21 +01:00
Jenkins for ownCloud b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Michael Gapczynski 0488968443 Merge pull request #2034 from owncloud/fix_bug47 
Fix #47 - Duplicate files create a (2) when multiples are uploaded
 2013-03-03 11:49:04 -08:00
Jörn Friedrich Dreyer 9cb5bf0a28 add ie css switch to layout templates 2013-03-03 13:57:20 +01:00
Jenkins for ownCloud 844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Georg Ehrke 620ddd3baa new Array() -> [] 2013-03-02 19:24:37 +01:00
Georg Ehrke 22424e8abc update OC.Notification.show 2013-03-02 17:36:04 +01:00
Brice Maron 050de008b1 Avoid to display empty DisplayNames for menu and title 2013-03-02 16:09:36 +01:00
Thomas Müller 2af3bc3e77 Merge pull request #2022 from owncloud/fix-notice 
Fix notice
 2013-03-01 23:39:27 -08:00
Lukas Reschke 630483c75d Fix notice 2013-03-02 00:53:53 +01:00
Jenkins for ownCloud c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Lukas Reschke 5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Georg Ehrke ff9476b3e3 fix oc#47 2013-03-01 18:30:25 +01:00
Lukas Reschke dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Bart Visscher 294403fa99 The router base url is without / on the end 2013-02-28 18:02:26 +01:00
Jan-Christoph Borchardt fbb989f548 up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135 2013-02-28 12:07:56 +01:00
Jan-Christoph Borchardt a2147c4f89 Merge pull request #1973 from owncloud/share-improvements 
reduce minimum length for username suggestions in share dialog, fix #1666
 2013-02-27 15:07:07 -08:00
Jenkins for ownCloud a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Lukas Reschke 39e28c0170 Typo... 2013-02-27 23:19:38 +01:00
Lukas Reschke 6f14bec70a Add a missing ) 2013-02-27 23:15:18 +01:00
Lukas Reschke 229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Lukas Reschke 40e51d13d2 Remove uneeded file 2013-02-27 22:35:37 +01:00
Bernhard Posselt 9508a58c79 Merge pull request #1944 from owncloud/query-caching-upgrade 
Disable prepared query caching while doing an upgrade
 2013-02-27 12:48:42 -08:00
Jan-Christoph Borchardt e01ab04d2b reduce minimum length for username suggestions in share dialog, fix #1666 2013-02-27 17:57:53 +01:00
Jenkins for ownCloud fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01: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
Bernhard Posselt 0828bb7e0e Merge pull request #1957 from owncloud/fix-895 
Fix 895
 2013-02-27 03:10:29 -08: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
Jan-Christoph Borchardt 86ffa28f72 quick fix for log in button not being aligned with input fields 2013-02-27 11:04:08 +01:00
Jenkins for ownCloud 348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Robin Appelman 47b899e0c8 Disable prepared query caching while doing an upgrade 2013-02-26 22:41:48 +01: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
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 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
Frank Karlitschek 69eb69be0e Merge pull request #1902 from owncloud/angularcsp 
add CSP turned on for angularjs
 2013-02-26 00:58:12 -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
Michael Gapczynski 5b732ac1ea Move space 2013-02-25 20:52:01 -05:00
Michael Gapczynski aa2ea9e3de Fix adding share icons to share action 2013-02-25 20:20:29 -05:00
Jenkins for ownCloud 63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01: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 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
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
Thomas Müller 7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465 
Fix 1465
 2013-02-25 04:34:13 -08:00
Jenkins for ownCloud 21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Jenkins for ownCloud 6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Thomas Mueller 9898ba4daf Merge branch 'master' into master-sqlserver 
Conflicts:
	core/templates/installation.php
 2013-02-22 22:59:09 +01:00
Jörn Friedrich Dreyer e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Bart Visscher bf0b9bac8b Remove unneeded code for user layout template 2013-02-22 00:22:43 +01:00
Bart Visscher 59582e0f3f Fix review issues 2013-02-22 00:21:06 +01:00
Jenkins for ownCloud 734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher 19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher 1a747b3e48 Style cleanup core dir 2013-02-21 23:47:21 +01:00
Jan-Christoph Borchardt e7d1bbfae3 fix giant advanced caret in installation 2013-02-21 18:20:14 +01:00
Jörn Friedrich Dreyer 0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
Arthur Schiwon eceb7341bb make number-input fields look like they should 2013-02-21 16:25:47 +01:00
Jenkins for ownCloud dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Brice Maron 4f4e81d3d2 Add message when trouble sending email ref #1799 2013-02-20 21:14:55 +01:00
raghunayyar 6ecc3d7ee1 Reduced email input width by 10% to increase space. 2013-02-20 23:08:21 +05:30
Frank Karlitschek 18dab4a88e Merge pull request #1738 from owncloud/fix_multiselect_in_settings 
Extra position check for multiselect dropdown. Fix app/issues/575
 2013-02-20 08:34:26 -08:00
raghunayyar 326aae8a08 Hovering on the unshare doesnt spoil look 2013-02-20 21:59:12 +05:30
raghunayyar d8e8dab006 Fixes the Email Button and the email input Width. 2013-02-20 21:37:23 +05:30
raghunayyar 170a5856e9 Merge branch 'sharing-css-fix' into sharing-dropdown-fixes 2013-02-20 21:25:18 +05:30
Thomas Mueller 5062ae250b Merge branch 'master' into master-sqlserver 
Conflicts:
	lib/files/cache/cache.php
 2013-02-20 10:55:20 +01:00
Jörn Friedrich Dreyer 0efa4182dc Update office icons 2013-02-20 10:42:54 +01:00
Frank Karlitschek a085e4c435 Merge pull request #1720 from owncloud/usermenu-css 
fix erroneous CSS, remove obsolete selectors
 2013-02-19 10:44:58 -08:00
raghunayyar d82c9fd623 Text stays inside the sharing dropdown 2013-02-19 15:12:35 +05:30
Jenkins for ownCloud 76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Thomas Mueller 2675290325 Merge branch 'master' into master-sqlserver 2013-02-18 11:39:04 +01:00
Jenkins for ownCloud 3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Jenkins for ownCloud c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Thomas Tanghus 5a8e0f2048 Extra position check for multiselect dropdown. Fix app/issues/575 2013-02-16 19:56:56 +01:00
Jenkins for ownCloud 83f0c8ce61 [tx-robot] updated from transifex 2013-02-16 00:05:50 +01:00
Jan-Christoph Borchardt 953c87db9c fix erroneous CSS, remove obsolete selectors 2013-02-15 18:37:52 +01:00
Robin Appelman b8e2454f68 Fix strict standard warning in user template 2013-02-15 16:10:06 +01:00
Jan-Christoph Borchardt ac32ae79af Merge pull request #1683 from owncloud/ie-fixes 
IE fixes
 2013-02-15 03:32:31 -08:00
Jenkins for ownCloud b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Thomas Mueller 4b80466880 Merge branch 'master' into master-sqlserver 
Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php
 2013-02-14 22:54:48 +01:00
Bart Visscher 9058d398a7 Merge pull request #1662 from owncloud/style-cleanup 
Style cleanup
 2013-02-14 12:54:36 -08:00
Thomas Müller 4320f23c87 Merge pull request #1702 from owncloud/remove-images 
remove unused images to lessen packaged size
 2013-02-14 12:46:40 -08:00
Thomas Müller 29bf3552a2 Merge pull request #1703 from owncloud/firstrunwizard-icons 
Firstrunwizard icons
 2013-02-14 12:41:23 -08:00
Lukas Reschke 5624f1b838 Merge pull request #1701 from owncloud/XSS-fixes 
Sanitize HTML
 2013-02-14 10:50:46 -08:00
Jan-Christoph Borchardt 5b20c30889 pixel align dark calendar and contacts icons 2013-02-14 18:52:32 +01:00
Jan-Christoph Borchardt 6adaf67f35 add dark calendar and contacts icon for firstrunwizard and others 2013-02-14 18:45:24 +01:00
Jan-Christoph Borchardt bb52271d22 exchange bright caret with dark triangle 2013-02-14 18:22:45 +01:00
Jan-Christoph Borchardt a410529b15 remove unused images to lessen packaged size 2013-02-14 18:20:53 +01:00
Lukas Reschke c7094197bf Sanitize HTML 2013-02-14 18:15:14 +01:00
Bernhard Posselt db30f94fc8 Merge pull request #1697 from owncloud/navigation-details 
Navigation details
 2013-02-14 08:39:17 -08:00
Jan-Christoph Borchardt 3f09cc139f double speed for user menu slide 2013-02-14 17:13:50 +01:00
Jan-Christoph Borchardt 95575a7fd1 simplify noise (immense file size reduction), also apply to user menu and header, fix #1576 2013-02-14 17:06:08 +01:00
Jan-Christoph Borchardt 1edfe874f5 only style text, password and search inputs like inputs, instead of using unsupported :not selector 2013-02-14 15:53:36 +01:00
Jan-Christoph Borchardt 53a3a307e8 no ugly border around checkboxes or radio buttons 2013-02-14 15:47:14 +01:00
Thomas Mueller e643742eb3 adding prototype trim as fallback for IE8 2013-02-14 12:59:26 +01:00
Thomas Mueller 8065c73339 fixing eventsource.js for IE8 2013-02-14 12:20:22 +01:00
Thomas Mueller 8877087b57 adding a compatibility.js as a single source to define all fallback function declarations 2013-02-14 12:20:04 +01:00
Jan-Christoph Borchardt f9a6ed6c73 fix navigation icons SVG replacement, also hover and active opacity for IE 2013-02-14 10:59:30 +01:00
Jan-Christoph Borchardt 09d9138f84 fix caret on installation page for IE 2013-02-14 10:58:05 +01:00
Jan-Christoph Borchardt 7d8898065e only show navigation scrollbar on hover, when needed, to be less obtrusive 2013-02-14 09:58:31 +01:00
Bart Visscher d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Jenkins for ownCloud bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Jan-Christoph Borchardt 6d7e324f4b Merge pull request #1574 from owncloud/installation-label-overflow 
Installation label overflow, fix #871
 2013-02-13 07:55:05 -08:00
Jenkins for ownCloud 8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
raghunayyar ed1c943f61 Makes password toggle button inside input. 2013-02-12 16:52:38 +05:30
Thomas Mueller 76b31f870c Merge branch 'master' into master-sqlserver 2013-02-12 00:32:38 +01:00
Jenkins for ownCloud fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Thomas Müller 58e57151e5 Merge pull request #1625 from owncloud/fix_shared_string 
fix bug while changing string from "Share" to "Shared"
 2013-02-11 12:39:16 -08:00
Jenkins for ownCloud 39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Björn Schießle 45ed0c6010 if you add/remove more than one user from the share dialog replacing 'Share' with 'Shared' will lead to a string with more and more trailing 'd's 2013-02-11 15:37:01 +01:00
Jan-Christoph Borchardt efc70e27bc Merge pull request #1610 from owncloud/improved_personal_page 
add the buttons for the clients to the personal page.
 2013-02-11 03:51:11 -08:00
Robin Appelman a7bfee576b Fix breadcrumbs overlapping into the content, preventing the select all checkbox from being clickable in subfolders 2013-02-11 11:58:55 +01:00
Jenkins for ownCloud 04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Bernhard Posselt f097fade01 Merge pull request #1601 from owncloud/lightbox-icons 
add big white icons for lightbox, slideshow etc
 2013-02-10 09:44:37 -08:00
Jan-Christoph Borchardt c5e17e099a split close and delete icon, add red hover for delete 2013-02-10 18:31:33 +01:00
Jan-Christoph Borchardt 0c4487d292 add big white icons for lightbox, slideshow etc 2013-02-10 18:06:18 +01:00
Björn Schießle 45a4016878 Merge pull request #1552 from raghunayyar/personalpage-style-fix 
Personal Page Password Toggle Loads Fine.
 2013-02-10 07:31:05 -08:00
Administrator 41ec976fd7 Bugfixes and cleanup MS SQL Server installation 2013-02-10 13:07:59 +01:00
Jan-Christoph Borchardt 1ba44a3325 Merge pull request #1538 from raghunayyar/admin-password-toggle 
Password Toggle Works on Installation
 2013-02-10 02:38:43 -08:00
Jenkins for ownCloud f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Thomas Müller 460faf3f97 Merge pull request #1569 from owncloud/clean-app-id 
Remove invalid characters from app id to prevent loading of invalid reso...
 2013-02-09 09:56:26 -08:00
Bernhard Posselt 0664b98b4f added icons and mimetypes for .msi and .exe files 2013-02-09 18:09:03 +01:00
Jörn Friedrich Dreyer bb656ca2fb Merge pull request #1561 from Raydiation/master 
Moved the iframe height and width fix from js to css
 2013-02-09 08:56:12 -08:00
Bernhard Posselt 62122148bf Revert "moved iframe height and width fix from js to css" 
This reverts commit 842fc85b9a.
 2013-02-09 17:46:23 +01:00
Bernhard Posselt 43981e62e2 Revert "added exe and msi filetypes and icon" 
This reverts commit aa1adf42c7.
 2013-02-09 17:46:07 +01:00
Bernhard Posselt aa1adf42c7 added exe and msi filetypes and icon 2013-02-09 17:41:17 +01:00
Bernhard Posselt 842fc85b9a moved iframe height and width fix from js to css 2013-02-09 17:41:17 +01:00
Thomas Müller d67d9566ce Merge branch 'master' into clean-app-id 2013-02-09 17:28:30 +01:00
Jan-Christoph Borchardt 79511f6d93 fixed database input group having two slightly thicker dividers 2013-02-09 17:14:20 +01:00
Jenkins for ownCloud 68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00
Frank Karlitschek 316807e0d3 Merge pull request #1624 from owncloud/singleselect 
Split editable select code used for quota selection into a jquery plugin
 2013-02-12 11:05:07 -08:00
Robin Appelman e68e5cc849 Split editable select code used for quota selection into a jquery plugin 2013-02-11 15:18:14 +01:00
Jan-Christoph Borchardt 8ff20ac683 ellipsize infield labels when too long, specifically fix #871 for database labels on installation 2013-02-09 17:13:02 +01:00
Bart Visscher 9dddcae9ca Remove invalid characters from app id to prevent loading of invalid resources 2013-02-09 15:10:40 +01:00
Thomas Müller 279cbeb001 Merge pull request #1481 from owncloud/fixing-1354-master 
basic WebDAV test in place now
 2013-02-09 05:13:33 -08:00
Thomas Müller 800609aaeb Merge pull request #1545 from owncloud/fix-oc_webroot 
fixup oc_webroot correctly before and after setup
 2013-02-09 03:27:22 -08:00
Thomas Müller c91334c54a Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers 
attach handlers to document instead of filelist
 2013-02-09 03:23:19 -08:00
Bernhard Posselt f8335c4815 moved iframe height and width fix from js to css 2013-02-09 11:34:25 +01:00
Frank Karlitschek 9bd45b26a5 add the buttons for the clients to the personal page. 
Useful and prettier
 2013-02-09 09:13:11 +01:00
raghunayyar e8d17e4e8e Personal Page Password Toggle Also Loads Well. 2013-02-09 11:40:07 +05:30
Jenkins for ownCloud e5c05e9674 [tx-robot] updated from transifex 2013-02-09 00:14:08 +01:00
Thomas Müller f42ac97045 Merge pull request #1547 from owncloud/navigation-color 
brighter grey for the navigation bar
 2013-02-08 13:30:25 -08:00
Jan-Christoph Borchardt bebdd113f5 use proper HTML for other security warning too 2013-02-08 19:59:42 +01:00
Jan-Christoph Borchardt c73f525050 brighter grey for the navigation bar, hopefully solves the weird similarity to the header 2013-02-08 19:33:22 +01:00
Bart Visscher d5f98a82aa fix-oc_webroot 2013-02-08 18:44:52 +01:00
Jan-Christoph Borchardt a26e66b232 improve and shorten security warning, add link to docs, fix #1342 2013-02-08 13:38:50 +01:00
raghunayyar eea4864c70 Removed whitespace from installation.php 2013-02-08 17:35:41 +05:30
raghunayyar b356b7065f Password Toggle Works on Installation as well. 2013-02-08 16:38:28 +05:30
Jörn Friedrich Dreyer 43ffb5945c attach handlers to document instead of filelist, minor whitespace cleanups 2013-02-08 11:05:56 +01:00
Jenkins for ownCloud 59249ebc0c [tx-robot] updated from transifex 2013-02-08 00:13:16 +01:00
Tobias Ramforth d577f790c8 Added MS SQL Server support 2013-02-08 00:00:51 +01:00
Lukas Reschke 217328e0e3 Merge pull request #1514 from owncloud/fix-setup 
Fix setup
 2013-02-07 13:48:44 -08:00
Thomas Müller 867650ee47 Merge pull request #1529 from owncloud/installation-login-fixes 
Installation login fixes
 2013-02-07 13:40:25 -08:00
Lukas Reschke c0154558c7 Merge pull request #1526 from owncloud/l10n-support-master 
L10n support master
 2013-02-07 12:38:36 -08:00
Bart Visscher a82d18d2f8 Fill oc_webroot with the expected value 2013-02-07 21:13:57 +01:00
blizzz fc7230349b Merge pull request #1530 from owncloud/fix-warning-displayname-layout 
Fix warning with displayname in user layout template
 2013-02-07 11:25:33 -08:00
Jan-Christoph Borchardt 8ca730f4c1 make show password toggle work for installation (once #1525 is fixed) 2013-02-07 18:07:38 +01:00
Bart Visscher 20b6cb28b1 Fix warning with displayname in user layout template 2013-02-07 18:07:27 +01:00
Jan-Christoph Borchardt 32e739f2ae make show password not specific to log in 2013-02-07 17:41:24 +01:00
Jan-Christoph Borchardt ee6884e336 remove duplicate show password toggle code, move current one to proper location 2013-02-07 17:04:03 +01:00
Jan-Christoph Borchardt ae7a80ede3 some comments for CSS documentation 2013-02-07 17:02:43 +01:00
Jan-Christoph Borchardt 867dc8e6dc fix database labels having left padding 2013-02-07 16:57:54 +01:00
Thomas Mueller 5f92d269dc l10n support enhanced in core 2013-02-07 16:49:36 +01:00
Thomas Mueller 5788d36c8d Merge branch 'master' into fixing-1354-master 
Conflicts:
	settings/admin.php
	settings/templates/admin.php
 2013-02-07 10:44:28 +01:00
Bart Visscher 458ba4b55c Fix disabling setup form on submit 2013-02-07 08:12:09 +01:00
Bart Visscher c0b370f6cf Define the variables that are expected to exist but won't be set in setup 2013-02-07 08:11:18 +01:00
Bart Visscher 149d079fd4 Move loading of js_config to templatelayout 
Also check for installed flag because this isn't available before setup
 2013-02-07 08:09:53 +01:00
Jenkins for ownCloud 35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Jan-Christoph Borchardt 4c406c9ab1 fix shorttag issue mentioned in #1357 2013-02-06 18:19:26 +01:00
Bart Visscher 3582f7bd09 Execute the post setup check after finishing the setup 2013-02-06 17:56:45 +01: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
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 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
Jan-Christoph Borchardt 964ff88f71 move inline style to CSS file, fix details 2013-02-06 15:15:20 +01:00
Jan-Christoph Borchardt 9961235c7b Merge pull request #1429 from owncloud/fix_addNavigation 
Make app icon linkable when enabling app.
 2013-02-05 05:47:14 -08:00
Jan-Christoph Borchardt 8ae1205b95 line up 'remember' text with checkbox 2013-02-05 12:49:33 +01:00