Commit Graph

9433 Commits

Author SHA1 Message Date
TheSFReader 7e3aa0de86 Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-02-02 09:44:09 +01:00
Lukas Reschke 23166aa016 Merge pull request #1415 from owncloud/ldap_fix_settings
LDAP settings Advanced tab has grown too long by far. Structure it using accordion.
2013-02-01 16:35:55 -08:00
Jenkins for ownCloud b29b55a332 [tx-robot] updated from transifex 2013-02-02 00:08:15 +01:00
Arthur Schiwon 10ad5f923a remove ugly whitespace 2013-02-01 23:52:41 +01:00
Arthur Schiwon a7d82ad0ee LDAP: settings Advanced tab has grown too long by far. Structure it using accordion 2013-02-01 23:48:22 +01:00
TheSFReader d8f6595c5e Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-02-01 23:28:20 +01:00
Sam Tuke 0677d56ee2 Added debugging output relating to recrypting legacy files 2013-02-01 19:31:15 +00:00
TheSFReader 469b1e8dd2 Correct it 2013-02-01 20:29:02 +01:00
Frank Karlitschek 03c18a6186 Merge pull request #1413 from owncloud/enable_removing_search_providers
add function to remove a search provider
2013-02-01 10:34:39 -08: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
Jörn Friedrich Dreyer 0c85250380 add function to remove a search provider 2013-02-01 19:21:54 +01:00
Bart Visscher 2488a495c6 Merge pull request #1384 from owncloud/upgrade_fix
Check for upgrade/maintance mode before trying to load an app
2013-02-01 07:12:06 -08:00
blizzz 88f4aced38 Merge pull request #1404 from owncloud/fixing-1276-master
fix #1276 - use registerLoadedCallback()
2013-02-01 03:13:23 -08:00
Thomas Mueller cc73568d68 Updateing -> Updating 2013-02-01 00:51:00 +01:00
Thomas Mueller fb0a5f3224 undelete -> restore 2013-02-01 00:43:52 +01:00
Thomas Mueller 402263bd5c fix #1276 - use registerLoadedCallback() 2013-02-01 00:33:14 +01: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 Müller b20529ee44 Merge pull request #1171 from owncloud/move-datadirectory-checks
Move data directory permission checks after data directory existence checks
2013-01-31 14:54:46 -08:00
Thomas Müller caec0c476d Merge pull request #1287 from owncloud/ocs_xml_attributes
API: Treat array keys starting with '@' as XML attributes
2013-01-31 14:39:31 -08:00
Michael Gapczynski a9e1c9bf6d Merge pull request #1351 from owncloud/navigation
New navigation design
2013-01-31 14:37:39 -08: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
Thomas Mueller c1072d0c09 call ajax scan only if a user is logged in - otherwise we'll get a 500 2013-01-31 23:26:40 +01:00
Thomas Mueller 2af6d74bc1 Merge branch 'master' into fixing-js-errors-public-link-master
Conflicts:
	apps/files/js/files.js
	apps/files/templates/part.list.php
2013-01-31 23:23:10 +01:00
Thomas Müller 317261d6df Merge pull request #1099 from herbrechtsmeier/ssl-proxy
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
Thomas Müller 206c6c1e1e Merge pull request #1398 from owncloud/appname-overlap
remove z-index from app labels which caused overlap with top bar
2013-01-31 13:56:49 -08:00
Thomas Müller df3fc65e6f Merge pull request #1399 from owncloud/fix_ldap_proxy_display_names
LDAP: implement getDisplayName and getDisplayNames also for UserProxy (m...
2013-01-31 13:50:20 -08:00
Thomas Mueller fc585623a5 spell check
👍
2013-01-31 22:49:07 +01:00
Brice Maron 17f94de19b Case insensitive Lang Detection fix #1328 2013-01-31 22:37:46 +01:00
raghunayyar 0118606e09 More Visible webkit Scrollbar, syntax error solved. 2013-02-01 02:50:31 +05:30
Arthur Schiwon a1dc24c9da LDAP: implement getDisplayName and getDisplayNames also for UserProxy (multiple server support) 2013-01-31 21:19:24 +01:00
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
Sam Tuke 06847f609b Improved support for detecting and recrypting legacy files. Bugs remain. 2013-01-31 19:40:51 +00:00
Jan-Christoph Borchardt 943c0334c1 remove z-index from app labels which caused overlap with top bar 2013-01-31 20:27:39 +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
Jan-Christoph Borchardt 5bf7791b42 Merge pull request #1396 from owncloud/apps_sorting
Sort internal apps above 3rdparty apps
2013-01-31 10:19:04 -08:00
Sam Tuke c6b3bdd5a0 Fixed compatibility with filecache rewrite merge 2013-01-31 17:51:46 +00:00
herbrechtsmeier 7747f49263 add SSL proxy support
Add support for a reverse proxy that only forwards SSL connections
unencrypted to the web server.

This patch allows to detect the reverse proxy via regular expression for
the remote IP address and conditional overwrite the host name, protocol
and web root.
2013-01-31 18:43:30 +01:00
Stefan Herbrechtsmeier ab2b79cda6 add multiple domains reverse proxy support
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).

As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
blizzz 878cf9bd3c Merge pull request #1393 from owncloud/adding-index.html-with-redirect-master
some web servers by default don't recognize index.php as default page - ...
2013-01-31 09:31:15 -08:00
blizzz 411e8e5218 Merge pull request #1365 from owncloud/ldap_multiple_server
LDAP: support for multiple LDAP/AD servers
2013-01-31 09:24:45 -08:00
Arthur Schiwon afacaf8bc2 string fragment was added by accident and does not belong here 2013-01-31 18:00:07 +01:00
Robin Appelman 5417e44b2a Files: fix moving files by DnD 2013-01-31 17:56:44 +01:00
Thomas Mueller 19714151e2 spell check 2013-01-31 17:53:01 +01:00
Thomas Mueller 5862f3d140 spell check 2013-01-31 17:51:59 +01:00
Robin Appelman a224d80f4d Sort internal apps above 3rdparty apps 2013-01-31 17:49:58 +01:00
Sam Tuke 2183f77527 Fixed incompatibilities with filecache rewrite merge 2013-01-31 16:49:07 +00:00
Thomas Mueller 7f2d7cdbe1 spell check 2013-01-31 17:44:25 +01:00