Jan-Christoph Borchardt
ea3b9366a4
merge navigation changes
2013-02-02 11:01:22 +01:00
Jan-Christoph Borchardt
fe6f447746
merge master into navigation
2013-02-02 10:50:10 +01:00
Jenkins for ownCloud
6df8aa24ba
[tx-robot] updated from transifex
2013-02-02 00:06:00 +01:00
Thomas Müller
075dc94b95
Merge pull request #449 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:44 -08:00
Jenkins for ownCloud
3c9fea82a1
[tx-robot] updated from transifex
2013-01-31 19:59:36 +01:00
Stefan Herbrechtsmeier
5dc1c806d9
add multiple domains reverse SSL proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (https://proxy.tld/domain.tld/owncloud ) and only forwards SSL
connections unencrypted to the web server.
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. Additionally
it adds a Sabre request backend that extends the Sabre_HTTP_Request to use
the same functions.
2013-01-31 18:47:37 +01:00
Jenkins for ownCloud
e7ff1de64a
[tx-robot] updated from transifex
2013-01-31 00:26:00 +01:00
Robin Appelman
ce3b7a2493
Merge branch 'filesystem' into gallery
2013-01-30 19:26:42 +01:00
Robin Appelman
68bfa6c4e1
Merge branch 'master' into filesystem
2013-01-30 19:26:22 +01:00
Jenkins for ownCloud
98fa3642a3
[tx-robot] updated from transifex
2013-01-30 16:08:13 +01:00
Lukas Reschke
bc832b76c8
Merge branch 'master' of https://github.com/owncloud/apps
2013-01-30 14:25:46 +01:00
Thomas Tanghus
525ebecc89
Contacts: Search improvements.
2013-01-30 00:47:47 +01:00
Jenkins for ownCloud
f9da29208e
[tx-robot] updated from transifex
2013-01-30 00:22:14 +01:00
Thomas Tanghus
bb8ea6081d
Contacts: Namespace combobox ui -> oc.
2013-01-29 20:47:25 +01:00
Thomas Tanghus
6ee6f4da94
Contacts: Fix combobox for new jquery ui.
2013-01-29 20:45:58 +01:00
Thomas Tanghus
4b2a32d0b2
Contacts: Use OCP\Contacts for search.
2013-01-29 20:17:55 +01:00
raghunayyar
55a232d88b
Various Style Fixes for Bookmarks, Contacts, Impress Apps for New Layout.
...
Bookmarks : #leftcontent loads fine
Contacts : The delete button centered, select tags increased padding
Impress : Documentation Button Fixed.
2013-01-29 13:45:22 +05:30
Jenkins for ownCloud
256a74e725
[tx-robot] updated from transifex
2013-01-29 00:04:05 +01:00
Robin Appelman
605272a26b
merge filesystem into gallery
2013-01-28 19:47:41 +01:00
Robin Appelman
ad51ec260c
change required ownCloud version to 4.91
2013-01-28 19:46:08 +01:00
Jan-Christoph Borchardt
a6090abf43
fix Contacts header left positioning for new layout
2013-01-28 13:15:36 +01:00
Robin Appelman
c531f06ca0
merge filesystem into gallery
2013-01-28 03:18:26 +01:00
Robin Appelman
3828729f92
merge master into filesystem
2013-01-28 03:17:27 +01:00
Jenkins for ownCloud
8505874daf
[tx-robot] updated from transifex
2013-01-28 00:04:23 +01:00
Jenkins for ownCloud
04b5e2def4
[tx-robot] updated from transifex
2013-01-27 00:04:12 +01:00
Jenkins for ownCloud
6194ba599b
[tx-robot] updated from transifex
2013-01-26 00:08:22 +01:00
Thomas Tanghus
c1ca6e6120
Contacts: Fix layout - somewhat...
2013-01-25 23:33:08 +01:00
Thomas Tanghus
a55c50fd73
Contacts: Use anchor instead of parameter.
2013-01-25 19:01:40 +01:00
Thomas Tanghus
860073502f
Contacts: No inline js in search results.
2013-01-25 19:00:10 +01:00
Thomas Tanghus
879dfd6b67
Contacts: Use OC.linkToRemote()
2013-01-25 17:27:49 +01:00
Lukas Reschke
cfec3288d9
Merge pull request #472 from owncloud/no-inline-js
...
No inline JS - Work in progress
2013-01-25 08:20:55 -08:00
Lukas Reschke
947cc1afdc
Merge branch 'master' into no-inline-js
2013-01-25 17:01:35 +01:00
Thomas Tanghus
ca10bf7109
Contacts: Add proper un-minified plcaholder polyfill.
2013-01-25 17:00:54 +01:00
Thomas Tanghus
f8e40090cb
Contacts: Removed unused files.
2013-01-25 16:55:08 +01:00
Thomas Tanghus
a2359a00b5
Contacts: More inline js in photo editor :-/
2013-01-25 16:48:14 +01:00
Lukas Reschke
f10118ff23
Undo uneeded changes
2013-01-25 16:33:41 +01:00
Lukas Reschke
5159a5b8f6
Undo uneeded changes
2013-01-25 16:30:14 +01:00
Lukas Reschke
61979f8ef0
Merge master
2013-01-25 16:27:31 +01:00
Thomas Tanghus
79628fef58
Contacts: js template fix.
2013-01-25 16:23:10 +01:00
Thomas Tanghus
dd508c2784
Contacts: Last inline js gone.
2013-01-25 16:22:38 +01:00
Thomas Tanghus
5475d3f16e
Contacts: One more inline js var down - one more to go ;)
2013-01-25 16:09:51 +01:00
Thomas Tanghus
a94d8b2906
Contacts: Remove unused check.
2013-01-25 15:10:53 +01:00
Thomas Tanghus
c5c8b29964
Contacts: Move check for indexed state to ajax call.
2013-01-25 15:08:56 +01:00
Thomas Tanghus
401fa38639
Contacts: Read queried contact id in app.js
2013-01-25 14:30:53 +01:00
Thomas Tanghus
eedd1bc5d2
Contacts: CSS fix
2013-01-25 13:58:54 +01:00
Thomas Tanghus
e616a27b41
Contacts: Show/hide PREF take 2
2013-01-25 13:29:16 +01:00
Thomas Tanghus
57eac9eff2
Contacts: Correct faulty docstring.
2013-01-25 13:29:16 +01:00
Jenkins for ownCloud
3cbbe3b3f1
[tx-robot] updated from transifex
2013-01-25 00:04:33 +01:00
Lukas Reschke
2d40d06bf9
Move inline JS to external file
2013-01-23 12:28:03 +01:00
Jenkins for ownCloud
fc73e6aa56
[tx-robot] updated from transifex
2013-01-23 00:04:26 +01:00
