wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12578 commits 157 branches 562 tags 714 MiB
Commit graph

1089 commits

Author SHA1 Message Date
Jenkins for ownCloud
cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Morris Jobke
867a527148 Merge pull request #2975 from owncloud/log-date 
use date and time instead of timestamp in log
 2013-04-17 06:49:46 -07:00
Bernhard Posselt
4679e789e1 also adjust template properly for log date fix 2013-04-17 15:31:05 +02:00
Bernhard Posselt
f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +02:00
Jenkins for ownCloud
37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
David Reagan
0dd6f16e0b Removed extra id from jquery selectors. Remove console.log call. Removed commented code. 2013-04-16 13:22:04 -07:00
David Reagan
6d812ada05 Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event. 2013-04-16 13:03:41 -07:00
Jenkins for ownCloud
d0b3e8aceb [tx-robot] updated from transifex 2013-04-16 02:17:30 +02:00
Jenkins for ownCloud
e13e4c412f [tx-robot] updated from transifex 2013-04-15 02:12:43 +02:00
Thomas Tanghus
f480596b94 Merge pull request #2896 from owncloud/app-enable-fix 
Add span tag while enabling or disbling apps as well.
 2013-04-13 06:57:42 -07:00
Jenkins for ownCloud
19afc216cf [tx-robot] updated from transifex 2013-04-13 02:15:54 +02:00
kondou
448a390486 Optimize svgs with scour. 2013-04-12 19:06:29 +02:00
raghunayyar
5228eb8a18 Add span tag while enabling or disbling apps as well. 2013-04-12 18:15:59 +05:30
Bernhard Posselt
18c873d1e5 Merge pull request #2554 from owncloud/hide-toggle-checkbox 
Implements Hide / Display for the Password Toggle Button
 2013-04-11 01:18:40 -07:00
raghunayyar
3d008b2ff3 New Password in Personal Password Page loads fine. 2013-04-11 12:34:46 +05:30
Jenkins for ownCloud
b02db643d0 [tx-robot] updated from transifex 2013-04-11 02:10:41 +02:00
Robin Appelman
1abc264873 Add the quota change listeners to newly added user entries in the user list 2013-04-10 14:12:54 +02:00
Jenkins for ownCloud
c06bc81c79 [tx-robot] updated from transifex 2013-04-10 02:09:39 +02:00
Robin Appelman
27f710d860 Users: fix "Other.." quota option for the default quota 2013-04-09 12:47:08 +02:00
Bernhard Posselt
bfe48ba99e Merge pull request #2800 from owncloud/fixing-2743-master 
fixes #2743 - use public OC_User::getDisplayName instead of OC_User::det...
 2013-04-09 00:17:01 -07:00
Jenkins for ownCloud
5ef389610f [tx-robot] updated from transifex 2013-04-09 02:14:02 +02:00
Thomas Mueller
ce54d00b5c fixes #2743 - use public OC_User::getDisplayName instead of OC_User::determineDisplayName 2013-04-08 23:11:33 +02:00
Jenkins for ownCloud
ccde0212b1 [tx-robot] updated from transifex 2013-04-08 02:18:28 +02:00
kondou
f59aedff4f Optimize pictures with optipng. 2013-04-07 20:09:25 +02:00
Bart Visscher
46a552fd56 Merge pull request #2738 from Kondou-ger/fix_alert_issues 
Fixed things in alert-messages
 2013-04-06 08:24:43 -07:00
kondou
de2e546617 Translate 'Error' in core 2013-04-06 16:52:55 +02:00
Jenkins for ownCloud
6798b6dc34 [tx-robot] updated from transifex 2013-04-06 00:05:32 +02:00
kondou
32f96e19e5 Fix Typo 2013-04-05 19:06:58 +02:00
kondou
8d63b7d9bf Fix #2693 
When removing a group response.data.action becomes 'remove', thus the if
shows an empty notification.
 2013-04-05 18:52:14 +02:00
root
74b02db337 Fixed things in alert-messages 
Two parameters for OC.dialogs.alert, otherwise one will be "undefined".

Also fixed missing translation.
 2013-04-05 01:56:32 +02:00
Jenkins for ownCloud
c745bfa821 [tx-robot] updated from transifex 2013-04-05 00:22:48 +02:00
Jenkins for ownCloud
cbece8b12f [tx-robot] updated from transifex 2013-04-04 00:06:51 +02:00
Jenkins for ownCloud
10e37e1553 [tx-robot] updated from transifex 2013-04-03 00:04:02 +02:00
Lukas Reschke
8000f9db74 Unescape the update hint 
Fixes #2647
 2013-04-02 16:39:21 +03:00
Jenkins for ownCloud
cfd8b911b6 [tx-robot] updated from transifex 2013-03-31 00:03:46 +01:00
Bernhard Posselt
8ed9be5408 Merge pull request #2597 from kabum/lesslog 
Make it possible to show less log entries again
 2013-03-29 07:22:43 -07:00
Bernhard Posselt
7c0999bd27 Merge pull request #2448 from owncloud/userlist_available_groups 
User list: Keep array of available groups. Should fix #873
 2013-03-29 07:19:09 -07:00
Morris Jobke
866ca51d83 fix typo and remove animation 2013-03-28 16:11:46 +01:00
Morris Jobke
f19fd30278 convert js call to css rule 2013-03-28 15:43:14 +01:00
Morris Jobke
df74c0e43a apply code review hints 2013-03-28 15:02:31 +01:00
Arthur Schiwon
942cdff240 Users: use DisplayName in the Display Name col when appending users 2013-03-27 18:52:15 +01:00
Morris Jobke
7c8a0a486b add copyright note 2013-03-27 16:53:51 +01:00
Morris Jobke
97d73d41a8 remove animation 2013-03-27 15:19:28 +01:00
Morris Jobke
d3ca97dd2f Make it possible to show less log entries again - fix owncloud/core#1593 
* show "less" button only if there are more than 3 entries
 * only "remove" logs till last 3 entries
 2013-03-27 15:14:09 +01:00
Jenkins for ownCloud
0c666cb764 [tx-robot] updated from transifex 2013-03-27 00:11:05 +01:00
Brice Maron
24d471af29 Improve detection of installations errors 2013-03-23 13:47:42 +01:00
Jenkins for ownCloud
4f6e13e673 [tx-robot] updated from transifex 2013-03-23 00:06:16 +01:00
Jenkins for ownCloud
a035ed0c19 [tx-robot] updated from transifex 2013-03-22 00:04:46 +01:00
Jenkins for ownCloud
3b1c7de459 [tx-robot] updated from transifex 2013-03-21 00:04:36 +01:00
Jenkins for ownCloud
63e3f978ab [tx-robot] updated from transifex 2013-03-20 00:02:44 +01:00
Thomas Tanghus
06a7d39024 User list: Keep array of available groups. Should fix #873 2013-03-19 14:49:02 +01:00
Thomas Tanghus
c13487332a User list: Avoid dupes and better sorting. Fix #2420 2013-03-19 02:48:08 +01:00
Jenkins for ownCloud
63ca84e7bc [tx-robot] updated from transifex 2013-03-19 00:05:52 +01:00
Jenkins for ownCloud
2a48aa322d [tx-robot] updated from transifex 2013-03-18 00:06:55 +01:00
Jenkins for ownCloud
1427af4a22 [tx-robot] updated from transifex 2013-03-16 22:18:26 +01:00
Jenkins for ownCloud
0c123ebf9d [tx-robot] updated from transifex 2013-03-15 00:06:36 +01:00
Jenkins for ownCloud
9a0cb2ccaa [tx-robot] updated from transifex 2013-03-14 00:06:29 +01:00
Jenkins for ownCloud
569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Jenkins for ownCloud
6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Jenkins for ownCloud
0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Jenkins for ownCloud
308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Jenkins for ownCloud
97222b1de5 [tx-robot] updated from transifex 2013-03-07 00:16:59 +01:00
Jenkins for ownCloud
c1a32b5073 [tx-robot] updated from transifex 2013-03-06 00:08:33 +01:00
Jenkins for ownCloud
6c96b93fd4 [tx-robot] updated from transifex 2013-03-05 00:19:07 +01:00
Frank Karlitschek
36a1bcb732 Merge pull request #2061 from owncloud/app-text 
Add the description as text and not as html
 2013-03-04 00:01:26 -08:00
Frank Karlitschek
d70912e72b Merge pull request #2060 from owncloud/escapeGroupname 
Sanitize uid, group and quota
 2013-03-04 00:00:47 -08:00
Frank Karlitschek
17f7bd4c14 Merge pull request #2059 from owncloud/getlog 
Add log as text and not as HTML
 2013-03-04 00:00:04 -08:00
Lukas Reschke
0252479e3e Add the description as text and not as html 2013-03-04 00:19:07 +01:00
Lukas Reschke
86a7202cda Sanitize uid, group and quota 2013-03-04 00:11:46 +01:00
Jenkins for ownCloud
b738aaba2a [tx-robot] updated from transifex 2013-03-04 00:07:35 +01:00
Lukas Reschke
962b7a7c80 Add log as text and not as HTML 2013-03-03 23:46:08 +01:00
Bart Visscher
376f350af2 Fix encoding settings ajax getlog 2013-03-03 23:14:36 +01:00
Jenkins for ownCloud
844e18a8b1 [tx-robot] updated from transifex 2013-03-03 00:06:56 +01:00
Thomas Müller
4c8c974740 Merge pull request #2020 from owncloud/fixing-bugtracker-link-master 
change bug tracker links to https://github.com/owncloud/core/blob/master...
 2013-03-02 02:16:45 -08:00
Jenkins for ownCloud
c9d9c381ec [tx-robot] updated from transifex 2013-03-02 00:05:42 +01:00
Bart Visscher
f21ecef0b4 Merge pull request #2019 from owncloud/fixing-languages-again-master 
some more new languages recently introduced to ownCloud
 2013-03-01 14:55:27 -08:00
Lukas Reschke
fadb11253b Merge branch 'master' into fixing-bugtracker-link-master 
Conflicts:
	core/templates/exception.php
	settings/templates/help.php
 2013-03-01 23:41:23 +01:00
Thomas Mueller
f9b454dab1 change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md 2013-03-01 23:32:43 +01:00
Thomas Mueller
6708dd80cd some more new languages recently introduced to ownCloud 2013-03-01 23:28:54 +01:00
Lukas Reschke
5e7970f761 Merge master 2013-03-01 23:11:03 +01:00
Jenkins for ownCloud
d20fd7e9a6 [tx-robot] updated from transifex 2013-03-01 00:07:02 +01:00
Lukas Reschke
dee16deacd Merge master 2013-02-28 20:03:06 +01:00
Jenkins for ownCloud
a93b5b47a1 [tx-robot] updated from transifex 2013-02-28 00:05:40 +01:00
Lukas Reschke
7311c2bb5d Remove uneeded OAuth files 2013-02-27 23:26:00 +01:00
Lukas Reschke
229c907a57 [core] From echo to p 2013-02-27 22:55:39 +01:00
Jenkins for ownCloud
fd654e9c2f [tx-robot] updated from transifex 2013-02-27 14:37:12 +01:00
Björn Schießle
f69fa2726c Merge pull request #1958 from owncloud/fixing-1933-master 
the locale name is no longer part of the translation string
 2013-02-27 03:15:03 -08:00
Thomas Mueller
c71fdf04d7 fixes 1933 - the locale name is no longer part of the translation string 2013-02-27 11:41:50 +01:00
Bernhard Posselt
a54be4acc4 Merge pull request #1948 from owncloud/improve_user_sorting 
Sort after display name + LDAP server side sorting
 2013-02-27 02:39:22 -08:00
Jenkins for ownCloud
348812f2ce [tx-robot] updated from transifex 2013-02-27 00:09:33 +01:00
Arthur Schiwon
60d4fdda57 sort users according to display name 2013-02-26 22:56:55 +01:00
Frank Karlitschek
072daf8850 Merge pull request #1885 from houqp/issue_1776 
when user changes displayName, also update it on expand button
 2013-02-26 00:19:42 -08:00
Jenkins for ownCloud
63d9feb8c0 [tx-robot] updated from transifex 2013-02-26 00:06:26 +01:00
Qingping Hou
195b52cb63 Merge branch 'master' of github.com:owncloud/core into issue_1776 
Conflicts:
	core/templates/layout.user.php
 2013-02-25 17:16:03 -05:00
Qingping Hou
c111a3aa24 add span tag to displayname on expand button 2013-02-25 15:40:57 -05:00
Qingping Hou
278a6f5b41 update oldDisplayName value on displayName change 
This patch fixes a bug that can be reproduced in following way:

1. change displayName
2. clear text in displayName input click change again

Then you will get an error and previous displayName will be restored.

Expected behavior should restore the new updated displayName.
 2013-02-24 18:13:25 -05:00
Qingping Hou
2f3c5d8afc when user changes displayName, also update it on expand button 2013-02-24 18:07:35 -05:00
Jenkins for ownCloud
21f3291eee [tx-robot] updated from transifex 2013-02-25 00:06:17 +01:00
Thomas Müller
a417028ccd Merge pull request #1862 from owncloud/whitespace-cleanup 
Whitespace cleanup
 2013-02-23 11:39:13 -08:00
Jenkins for ownCloud
6aa0ecc9b8 [tx-robot] updated from transifex 2013-02-23 00:05:33 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Bernhard Posselt
78fce83405 Merge pull request #1855 from owncloud/userlist_load_displaynames 
Fetch displayname in userlist ajax requests. Refs #1681
 2013-02-22 07:44:24 -08:00
Jörn Friedrich Dreyer
e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Thomas Tanghus
2268596e1a Fetch displayname in userlist ajax requests. Refs #1681 2013-02-22 14:51:21 +01:00
Thomas Müller
31d2b9bc07 Merge pull request #1838 from owncloud/fix-changedisplayname-call 
Fix error path in changedisplayname call
 2013-02-22 02:14:00 -08:00
Bart Visscher
83e613b45a Fix error path in changedisplayname call 2013-02-22 00:49:44 +01:00
Jenkins for ownCloud
734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher
83f161d3f9 Style cleanup settings 2013-02-21 23:47:56 +01:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Jenkins for ownCloud
99758dce2b [tx-robot] updated from transifex 2013-02-20 00:03:28 +01:00
Jenkins for ownCloud
76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Victor Dubiniuk
06dbcec5a1 Do not set password if it has't provided 2013-02-18 21:20:48 +03:00
Victor Dubiniuk
c5f6a77dbd Correct new password input name 2013-02-18 21:15:32 +03:00
Lukas Reschke
a984a27fa0 Sanitize user input 2013-02-18 08:04:35 +01:00
Jenkins for ownCloud
3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Jenkins for ownCloud
c8e7b14ab3 [tx-robot] updated from transifex 2013-02-17 00:26:17 +01:00
Jenkins for ownCloud
83f0c8ce61 [tx-robot] updated from transifex 2013-02-16 00:05:50 +01:00
blizzz
cd310add23 Merge pull request #1694 from owncloud/users-header 
Users header
 2013-02-15 05:36:21 -08:00
Jan-Christoph Borchardt
ac32ae79af Merge pull request #1683 from owncloud/ie-fixes 
IE fixes
 2013-02-15 03:32:31 -08:00
Jan-Christoph Borchardt
8b09fbc150 Merge pull request #1700 from owncloud/fixing-1680-master 
Fixing 1680 master
 2013-02-15 03:21:49 -08:00
Jenkins for ownCloud
b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Bart Visscher
9058d398a7 Merge pull request #1662 from owncloud/style-cleanup 
Style cleanup
 2013-02-14 12:54:36 -08:00
Thomas Mueller
d2f34183a6 sort languages based on display name not the iso code 2013-02-14 21:34:15 +01:00
Thomas Mueller
a63f5ffa75 some more missing language code fallbacks 2013-02-14 20:59:14 +01:00
Lukas Reschke
5624f1b838 Merge pull request #1701 from owncloud/XSS-fixes 
Sanitize HTML
 2013-02-14 10:50:46 -08:00
Lukas Reschke
c7094197bf Sanitize HTML 2013-02-14 18:15:14 +01:00
Thomas Mueller
2e280167b8 adding language code oc 2013-02-14 17:51:27 +01:00
Thomas Mueller
61e3c158b2 add some missing fallback language mappings 2013-02-14 17:46:53 +01:00
Jan-Christoph Borchardt
f29a0ec67d also fix header alignment for multiselect columns 2013-02-14 16:38:34 +01:00
Jan-Christoph Borchardt
0f405d9895 fix Users settings header bar element positioning, close #1686 2013-02-14 16:38:10 +01:00
Thomas Mueller
c5d716effe fixing javascript errors IE8 in apps management 2013-02-14 15:47:48 +01:00
Jan-Christoph Borchardt
e8190c6511 fix user delete button not showing in IE, another SVG replacement issue 2013-02-14 13:01:51 +01:00
Thomas Mueller
022993c098 fixing javascript errors IE8 in user management 2013-02-14 12:59:59 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 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
Thomas Mueller
9d6f74c65e missing piece after merge 2013-02-13 10:59:41 +01:00
Thomas Mueller
bc43dd704f Merge branch 'master' into fixing-1424-master 
Conflicts:
	settings/js/users.js
 2013-02-13 01:18:01 +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
Jenkins for ownCloud
8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Jenkins for ownCloud
fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Thomas Mueller
037fcde133 Merge branch 'master' into fixing-1424-master 2013-02-11 21:42:27 +01:00
Jenkins for ownCloud
39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01: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
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
Jan-Christoph Borchardt
40d8a2531d move CSS to correct location, move and format php 2013-02-11 12:49:52 +01:00
Jan-Christoph Borchardt
47341eb4bd spaces to tabs 2013-02-11 12:41:14 +01:00
Jan-Christoph Borchardt
2b586eb91c correct target blank from image to link 2013-02-11 12:40:17 +01:00
Thomas Müller
b9089fe8d9 Merge branch 'master' into fixing-1424-master 2013-02-09 19:15:23 +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
Frank Karlitschek
4a130d106c I'm an evil bastard and I commit this 3 letter text fix without a pull request. 2013-02-09 10:09:37 +01:00
Jenkins for ownCloud
04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +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
Björn Schießle
d8fee28b3b add switch to enable/disable the possibility to change the display name by the user 2013-02-10 14:43:31 +01:00
Lukas Reschke
01fabd6c65 Merge pull request #1577 from owncloud/typo_catagory 
Typo
 2013-02-10 02:31:34 -08:00
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
Lukas Reschke
bd2f8980cd Typo 2013-02-09 23:37:42 +01:00
Frank Karlitschek
c14f0b5637 add in new window 2013-02-09 09:30:59 +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
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
Thomas Müller
05b46f7828 on creation only test for existing users if the backend supports user creation 
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
 2013-02-08 17:16:18 +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