Commit Graph

417 Commits

Author SHA1 Message Date
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
Thomas Müller 7c30c1a2e8 Merge pull request #1833 from owncloud/fix_1465
Fix 1465
2013-02-25 04:34:13 -08:00
Thomas Mueller 9898ba4daf Merge branch 'master' into master-sqlserver
Conflicts:
	core/templates/installation.php
2013-02-22 22:59:09 +01:00
Bart Visscher 1a747b3e48 Style cleanup core dir 2013-02-21 23:47:21 +01:00
Jörn Friedrich Dreyer 0dd7fd0599 IE8 does not support window.onclick 2013-02-21 17:38:25 +01:00
Thomas Tanghus 5a8e0f2048 Extra position check for multiselect dropdown. Fix app/issues/575 2013-02-16 19:56:56 +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
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
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
Thomas Mueller 76b31f870c Merge branch 'master' into master-sqlserver 2013-02-12 00:32:38 +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
Administrator 41ec976fd7 Bugfixes and cleanup MS SQL Server installation 2013-02-10 13:07:59 +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 1ba44a3325 Merge pull request #1538 from raghunayyar/admin-password-toggle
Password Toggle Works on Installation
2013-02-10 02:38:43 -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
Bart Visscher d5f98a82aa fix-oc_webroot 2013-02-08 18:44:52 +01:00
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
Tobias Ramforth d577f790c8 Added MS SQL Server support 2013-02-08 00:00:51 +01:00
Bart Visscher a82d18d2f8 Fill oc_webroot with the expected value 2013-02-07 21:13:57 +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
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
raghunayyar 3bcf3c91e1 Password Toggle Support for Login 2013-02-03 11:56:00 +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
Jan-Christoph Borchardt 3d5c7ca245 Merge branch 'master' into navigation 2013-01-31 19:28:25 +01:00
Björn Schießle 9cd692a6d0 use the same tooltip as for the password field 2013-01-31 17:00:05 +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
Jan-Christoph Borchardt 284e690737 Merge branch 'master' into navigation 2013-01-30 13:53:43 +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
Michael Gapczynski ed2ee8c411 Change file action text for files inside shared folders as well 2013-01-28 23:16:29 -05:00
Michael Gapczynski ede7fccb00 Change file action text to 'Shared' 2013-01-28 23:13:38 -05:00
Jan-Christoph Borchardt a78ae6a5cb Merge branch 'master' into permanent-share-icons 2013-01-28 19:39:51 +01:00
Jan-Christoph Borchardt 3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Thomas Mueller 1d44a99ebb Merge branch 'master' into updater-CSP
Conflicts:
	core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller 31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Michael Gapczynski 0986b6f910 Use global oc_requesttoken for Event Source 2013-01-26 16:36:48 -05:00
Michael Gapczynski 31ebea0f6a Permanently display shared status icons 2013-01-26 13:25:15 -05:00
Lukas Reschke 7f0a3018b6 Fix undefined variable 2013-01-26 13:46:00 +01:00
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
Lukas Reschke dbc13cf6ee Move update inline JS 2013-01-25 19:18:16 +01:00
Björn Schießle a606e8d944 use display name to show share_width and owner information 2013-01-25 17:40:23 +01:00
Lukas Reschke 047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Thomas Tanghus 936e991394 Add js linkToRemote and linkToRemoteBase 2013-01-25 16:00:26 +01:00