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

1399 Commits

Author SHA1 Message Date
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
Jan-Christoph Borchardt 7eaa2d0de1 form detail on log in button, better shape 2013-02-05 12:48:30 +01:00
Jan-Christoph Borchardt c47fcf7d22 shift infield labels just a tiny bit to the right so the cursor doesn't overlap 2013-02-05 12:30:23 +01:00
Jan-Christoph Borchardt 2ec0c491d4 remove superfluous enabled-app class again 2013-02-05 11:30:18 +01:00
Jenkins for ownCloud 98f37f4bed [tx-robot] updated from transifex 2013-02-05 00:20:29 +01:00
Thomas Tanghus b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +01:00
Thomas Müller 04b97a1906 Merge pull request #1229 from owncloud/from_live_to_on 
replace live() with on() in core js
 2013-02-03 21:55:54 -08:00
Thomas Tanghus bb9be6f629 Add box-sizing to controls. 2013-02-04 00:24:34 +01:00
Jenkins for ownCloud da6e79a381 [tx-robot] updated from transifex 2013-02-04 00:05:52 +01:00
Thomas Tanghus 1557b6d99d Fix leftcontent positioning. Ref #1255 2013-02-03 14:44:33 +01:00
Jan-Christoph Borchardt b8e6b8692b fix CSS to coding guideline 2013-02-03 12:24:24 +01:00
raghunayyar 3bcf3c91e1 Password Toggle Support for Login 2013-02-03 11:56:00 +01:00
Jenkins for ownCloud 2936140838 [tx-robot] updated from transifex 2013-02-03 00:06:15 +01:00
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
Jan-Christoph Borchardt 48022f4525 Merge pull request #1395 from raghunayyar/webkit-scrollbar-534 
Adds webkit scrollbar to ownCloud
 2013-02-01 10:26:23 -08:00
Jenkins for ownCloud 94f7446724 [tx-robot] updated from transifex 2013-02-01 00:19:28 +01:00
Robin Appelman 5dd2c9152e fix breadcrumbs for gallery and texteditor 2013-02-01 00:14:39 +01:00
Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on 
Conflicts:
	apps/files_external/js/google.js
 2013-01-31 23:34:12 +01:00
raghunayyar 0118606e09 More Visible webkit Scrollbar, syntax error solved. 2013-02-01 02:50:31 +05:30
Jan-Christoph Borchardt 45865b45c4 use translate string for Log out, remove title 2013-01-31 20:45:59 +01:00
Jan-Christoph Borchardt 6d560be564 fix svg fallback replacement for settings icons 2013-01-31 20:42:44 +01:00
Jan-Christoph Borchardt 3f3ae4a985 fix header for shared links 2013-01-31 20:19:32 +01:00
Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Thomas Müller 0dd9e6cb12 Merge pull request #1387 from schiesbn/visual_improvements 
small visual improvements
 2013-01-31 08:30:25 -08:00
raghunayyar 5605297387 Adds webkit scrollbar to ownCloud 2013-01-31 21:51:44 +05:30
Jenkins for ownCloud 209d599ec5 [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
Björn Schießle 9cd692a6d0 use the same tooltip as for the password field 2013-01-31 17:00:05 +01:00
Jan-Christoph Borchardt 43f8bf8e5c Merge pull request #1358 from owncloud/button-fix 
increase opacity of buttons, fix for dark backgrounds like header in pub...
 2013-01-31 06:40:14 -08:00
Jan-Christoph Borchardt ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Jan-Christoph Borchardt f0ca8eeba4 no box-shadow for public share download button 2013-01-31 15:21:50 +01:00
Jan-Christoph Borchardt cbafea4cc8 increase opacity of inactive apps and settings entries for better visibility 2013-01-31 14:32:07 +01:00
Jan-Christoph Borchardt 1144b61db3 vertical scrollbar for app navigation when too many apps 2013-01-31 14:14:12 +01:00
Jan-Christoph Borchardt 90aa1b3532 ellipsize long app names in navigation 2013-01-31 14:04:33 +01:00
Jan-Christoph Borchardt c801b86bc2 Merge pull request #1359 from raghunayyar/navigation 
No Image Repetition on Enabling Apps in Navigation Bar
 2013-01-31 05:01:20 -08:00
Jan-Christoph Borchardt 300ecc2ed2 change button box-shadow from hard white to slight transparent 2013-01-31 12:59:36 +01:00
Björn Schießle 54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Jenkins for ownCloud 00a30e6651 [tx-robot] updated from transifex 2013-01-31 00:31:28 +01:00
Jan-Christoph Borchardt 228a181d48 use new user function to display real name if available, username still fallback 2013-01-30 18:35:53 +01:00
Jörn Friedrich Dreyer d7823adb07 attach to filelist which is present on .ready() 2013-01-30 17:46:33 +01:00
Jörn Friedrich Dreyer 22812c5f0d replace live() with on() in core js 2013-01-30 17:00:54 +01:00
raghunayyar 0dfbd53a6e Reduced Styling and Image loads as from src and not backgorund. 2013-01-30 19:12:51 +05:30
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +01:00
Björn Schießle 9639544ca0 make background transparent 2013-01-30 12:56:22 +01:00
Jenkins for ownCloud 68266e70f2 [tx-robot] updated from transifex 2013-01-30 00:25:41 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name 
introduction of display names
 2013-01-29 14:05:54 -08:00
Björn Schießle d19de49606 prevent xss 2013-01-29 22:32:59 +01:00
raghunayyar d620495e92 No Image Repetition on Enabling Apps in Navigation Bar 2013-01-30 00:54:23 +05:30
Jan-Christoph Borchardt e2f1a445ed increase opacity of buttons, fix for dark backgrounds like header in public share, fix #1188 2013-01-29 19:13:39 +01:00
Thomas Mueller 825cdf8560 add support for apps to register alternative login methods 
below the standard login a list of icons/button will be displayed
 2013-01-29 17:28:08 +01:00
Björn Schießle d10e137939 icons added; empty trash bin message added 2013-01-29 10:03:04 +01:00
Michael Gapczynski 5143660cd3 Merge pull request #1324 from owncloud/permanent-share-icons 
Permanently display shared status icons
 2013-01-28 20:17:40 -08:00