Jenkins for ownCloud
|
f7d898d835
|
[tx-robot] updated from transifex
|
2013-02-10 00:10:29 +01:00 |
Lukas Reschke
|
2dde418e99
|
Remove uneeded lines
|
2013-02-09 23:43:48 +01:00 |
|
Thomas Müller
|
0222c589ac
|
Merge pull request #1546 from owncloud/fix-loading-hooks
Fix loading hooks when going though the routing system
|
2013-02-09 09:59:41 -08:00 |
|
Thomas Müller
|
e68cf72458
|
Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
|
2013-02-09 09:58:05 -08: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 |
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
|
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 |
Bart Visscher
|
9dddcae9ca
|
Remove invalid characters from app id to prevent loading of invalid resources
|
2013-02-09 15:10:40 +01:00 |
|
Lukas Reschke
|
18fa8e2753
|
json_encode the appid
|
2013-02-09 15:06:35 +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 |
|
Bernhard Posselt
|
f8335c4815
|
moved iframe height and width fix from js to css
|
2013-02-09 11:34:25 +01:00 |
|
Jenkins for ownCloud
|
e5c05e9674
|
[tx-robot] updated from transifex
|
2013-02-09 00:14:08 +01:00 |
|
Bart Visscher
|
340d6fce11
|
Better way of getting the navigation entries for an app
|
2013-02-08 18:53:43 +01:00 |
|
Thomas Müller
|
232a98524c
|
some systems use en_US.UTF8 instead of en_US.UTF-8
|
2013-02-08 17:49:54 +01:00 |
|
Jenkins for ownCloud
|
59249ebc0c
|
[tx-robot] updated from transifex
|
2013-02-08 00:13:16 +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 |
|
Thomas Mueller
|
84f3c8b6cc
|
show webdav test results in admin section as well
|
2013-02-07 00:49:39 +01:00 |
|
Jenkins for ownCloud
|
35bd7a400d
|
[tx-robot] updated from transifex
|
2013-02-07 00:11:04 +01:00 |
|
Lukas Reschke
|
e969a78cf9
|
Merge pull request #1443 from owncloud/use-module-file-info-master
we get best results regarding mime type detection if we use fileinfo - l...
|
2013-02-06 11:53:13 -08:00 |
|
Lukas Reschke
|
93b1597395
|
Merge pull request #1506 from owncloud/files_encryption
Files encryption
|
2013-02-06 11:47:55 -08:00 |
|
Lukas Reschke
|
ad644b4e08
|
Merge pull request #1363 from owncloud/FixPasswordChange
Fix password change
|
2013-02-06 11:14:59 -08:00 |
Sam Tuke
|
2c22619a18
|
Reverted fix temporarily; another fix by LukasReschke is awaiting merge
|
2013-02-06 19:06:55 +00:00 |
|
Sam Tuke
|
faf6cb0868
|
Merge branch 'master' into files_encryption
|
2013-02-06 18:26:44 +00:00 |
|
Sam Tuke
|
954a627483
|
Added comment
|
2013-02-06 18:24:35 +00:00 |
|
Sam Tuke
|
81de09711b
|
Fixed bug causing password change related hooks to not be called due to ajax
|
2013-02-06 17:42:29 +00: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 |
|
Sam Tuke
|
d9631aebfc
|
Merge branch 'master' into files_encryption
|
2013-02-06 16:05:14 +00:00 |
|
Sam Tuke
|
a8c0e3612c
|
Removed call to depreciated isUserVerified()
|
2013-02-06 16:01:43 +00:00 |
Georg Ehrke
|
0a16d25724
|
make it possible to modify the links to the clients
|
2013-02-06 15:20:43 +01:00 |
Björn Schießle
|
e68d0c7398
|
make strings translatable
|
2013-02-06 11:55:19 +01:00 |
|
Björn Schießle
|
9d73e7eb1e
|
let the user change his display name, if supported by the back-end
|
2013-02-06 11:38:03 +01:00 |
|
Jenkins for ownCloud
|
335b6cd060
|
[tx-robot] updated from transifex
|
2013-02-06 00:06:28 +01:00 |
Arthur Schiwon
|
5221ee0c5a
|
offer change password only when the action is supported by the user backend
|
2013-02-05 19:26:00 +01:00 |
|
Thomas Tanghus
|
cda0780d4b
|
Remove superfluous append
|
2013-02-05 14:15:17 +01:00 |
Jan-Christoph Borchardt
|
2ec0c491d4
|
remove superfluous enabled-app class again
|
2013-02-05 11:30:18 +01:00 |
|
Jan-Christoph Borchardt
|
4059959c5f
|
Merge branch 'master' into fix_addNavigation
|
2013-02-05 11:09:38 +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 Mueller
|
6058c2f734
|
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
|
2013-02-04 15:04:26 +01:00 |
|
Thomas Tanghus
|
46e10407f7
|
Remove padding hack to position users list.
|
2013-02-04 14:09:32 +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 |
|
Jenkins for ownCloud
|
da6e79a381
|
[tx-robot] updated from transifex
|
2013-02-04 00:05:52 +01:00 |
|
Thomas Tanghus
|
88ad1e5fbd
|
Make app icon linkable when enabling app.
|
2013-02-03 16:02:25 +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 |
|
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
|
402263bd5c
|
fix #1276 - use registerLoadedCallback()
|
2013-02-01 00:33:14 +01:00 |