c13487332a
User list: Avoid dupes and better sorting. Fix #2420
2013-03-19 02:48:08 +01:00
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
2a48aa322d
[tx-robot] updated from transifex
2013-03-18 00:06:55 +01:00
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
308c85090e
[tx-robot] updated from transifex
2013-03-08 00:26:35 +01:00
97222b1de5
[tx-robot] updated from transifex
2013-03-07 00:16:59 +01:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
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
d70912e72b
Merge pull request #2060 from owncloud/escapeGroupname
...
Sanitize uid, group and quota
2013-03-04 00:00:47 -08:00
17f7bd4c14
Merge pull request #2059 from owncloud/getlog
...
Add log as text and not as HTML
2013-03-04 00:00:04 -08:00
0252479e3e
Add the description as text and not as html
2013-03-04 00:19:07 +01:00
86a7202cda
Sanitize uid, group and quota
2013-03-04 00:11:46 +01:00
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
962b7a7c80
Add log as text and not as HTML
2013-03-03 23:46:08 +01:00
376f350af2
Fix encoding settings ajax getlog
2013-03-03 23:14:36 +01:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
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
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
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
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
f9b454dab1
change bug tracker links to https://github.com/owncloud/core/blob/master/CONTRIBUTING.md
2013-03-01 23:32:43 +01:00
6708dd80cd
some more new languages recently introduced to ownCloud
2013-03-01 23:28:54 +01:00
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
7311c2bb5d
Remove uneeded OAuth files
2013-02-27 23:26:00 +01:00
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
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
c71fdf04d7
fixes 1933 - the locale name is no longer part of the translation string
2013-02-27 11:41:50 +01:00
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
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
60d4fdda57
sort users according to display name
2013-02-26 22:56:55 +01:00
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
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
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
c111a3aa24
add span tag to displayname on expand button
2013-02-25 15:40:57 -05:00
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
2f3c5d8afc
when user changes displayName, also update it on expand button
2013-02-24 18:07:35 -05:00
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
a417028ccd
Merge pull request #1862 from owncloud/whitespace-cleanup
...
Whitespace cleanup
2013-02-23 11:39:13 -08:00
6aa0ecc9b8
[tx-robot] updated from transifex
2013-02-23 00:05:33 +01:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
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
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
2268596e1a
Fetch displayname in userlist ajax requests. Refs #1681
2013-02-22 14:51:21 +01:00
31d2b9bc07
Merge pull request #1838 from owncloud/fix-changedisplayname-call
...
Fix error path in changedisplayname call
2013-02-22 02:14:00 -08:00
83e613b45a
Fix error path in changedisplayname call
2013-02-22 00:49:44 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
83f161d3f9
Style cleanup settings
2013-02-21 23:47:56 +01:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
06dbcec5a1
Do not set password if it has't provided
2013-02-18 21:20:48 +03:00
c5f6a77dbd
Correct new password input name
2013-02-18 21:15:32 +03:00
a984a27fa0
Sanitize user input
2013-02-18 08:04:35 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
cd310add23
Merge pull request #1694 from owncloud/users-header
...
Users header
2013-02-15 05:36:21 -08:00
ac32ae79af
Merge pull request #1683 from owncloud/ie-fixes
...
IE fixes
2013-02-15 03:32:31 -08:00
8b09fbc150
Merge pull request #1700 from owncloud/fixing-1680-master
...
Fixing 1680 master
2013-02-15 03:21:49 -08:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
d2f34183a6
sort languages based on display name not the iso code
2013-02-14 21:34:15 +01:00
a63f5ffa75
some more missing language code fallbacks
2013-02-14 20:59:14 +01:00
5624f1b838
Merge pull request #1701 from owncloud/XSS-fixes
...
Sanitize HTML
2013-02-14 10:50:46 -08:00
c7094197bf
Sanitize HTML
2013-02-14 18:15:14 +01:00
2e280167b8
adding language code oc
2013-02-14 17:51:27 +01:00
61e3c158b2
add some missing fallback language mappings
2013-02-14 17:46:53 +01:00
f29a0ec67d
also fix header alignment for multiselect columns
2013-02-14 16:38:34 +01:00
0f405d9895
fix Users settings header bar element positioning, close #1686
2013-02-14 16:38:10 +01:00
c5d716effe
fixing javascript errors IE8 in apps management
2013-02-14 15:47:48 +01:00
e8190c6511
fix user delete button not showing in IE, another SVG replacement issue
2013-02-14 13:01:51 +01:00
022993c098
fixing javascript errors IE8 in user management
2013-02-14 12:59:59 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
9d6f74c65e
missing piece after merge
2013-02-13 10:59:41 +01:00
bc43dd704f
Merge branch 'master' into fixing-1424-master
...
Conflicts:
settings/js/users.js
2013-02-13 01:18:01 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
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
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
037fcde133
Merge branch 'master' into fixing-1424-master
2013-02-11 21:42:27 +01:00
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
e68e5cc849
Split editable select code used for quota selection into a jquery plugin
2013-02-11 15:18:14 +01:00
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
40d8a2531d
move CSS to correct location, move and format php
2013-02-11 12:49:52 +01:00
47341eb4bd
spaces to tabs
2013-02-11 12:41:14 +01:00
2b586eb91c
correct target blank from image to link
2013-02-11 12:40:17 +01:00
b9089fe8d9
Merge branch 'master' into fixing-1424-master
2013-02-09 19:15:23 +01:00
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
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
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
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
62122148bf
Revert "moved iframe height and width fix from js to css"
...
This reverts commit 842fc85b9a
2013-02-09 17:46:23 +01:00
842fc85b9a
moved iframe height and width fix from js to css
2013-02-09 17:41:17 +01:00
d67d9566ce
Merge branch 'master' into clean-app-id
2013-02-09 17:28:30 +01:00
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
18fa8e2753
json_encode the appid
2013-02-09 15:06:35 +01:00
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
f8335c4815
moved iframe height and width fix from js to css
2013-02-09 11:34:25 +01:00
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
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
45a4016878
Merge pull request #1552 from raghunayyar/personalpage-style-fix
...
Personal Page Password Toggle Loads Fine.
2013-02-10 07:31:05 -08:00
d8fee28b3b
add switch to enable/disable the possibility to change the display name by the user
2013-02-10 14:43:31 +01:00
01fabd6c65
Merge pull request #1577 from owncloud/typo_catagory
...
Typo
2013-02-10 02:31:34 -08:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
2dde418e99
Remove uneeded lines
2013-02-09 23:43:48 +01:00
bd2f8980cd
Typo
2013-02-09 23:37:42 +01:00
c14f0b5637
add in new window
2013-02-09 09:30:59 +01:00
9bd45b26a5
add the buttons for the clients to the personal page.
...
Useful and prettier
2013-02-09 09:13:11 +01:00
e8d17e4e8e
Personal Page Password Toggle Also Loads Well.
2013-02-09 11:40:07 +05:30
e5c05e9674
[tx-robot] updated from transifex
2013-02-09 00:14:08 +01:00
340d6fce11
Better way of getting the navigation entries for an app
2013-02-08 18:53:43 +01:00
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +01:00
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
59249ebc0c
[tx-robot] updated from transifex
2013-02-08 00:13:16 +01:00
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
84f3c8b6cc
show webdav test results in admin section as well
2013-02-07 00:49:39 +01:00
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
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
93b1597395
Merge pull request #1506 from owncloud/files_encryption
...
Files encryption
2013-02-06 11:47:55 -08:00
ad644b4e08
Merge pull request #1363 from owncloud/FixPasswordChange
...
Fix password change
2013-02-06 11:14:59 -08:00
2c22619a18
Reverted fix temporarily; another fix by LukasReschke is awaiting merge
2013-02-06 19:06:55 +00:00
faf6cb0868
Merge branch 'master' into files_encryption
2013-02-06 18:26:44 +00:00
954a627483
Added comment
2013-02-06 18:24:35 +00:00
81de09711b
Fixed bug causing password change related hooks to not be called due to ajax
2013-02-06 17:42:29 +00:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
d9631aebfc
Merge branch 'master' into files_encryption
2013-02-06 16:05:14 +00:00
a8c0e3612c
Removed call to depreciated isUserVerified()
2013-02-06 16:01:43 +00:00
0a16d25724
make it possible to modify the links to the clients
2013-02-06 15:20:43 +01:00
e68d0c7398
make strings translatable
2013-02-06 11:55:19 +01:00
9d73e7eb1e
let the user change his display name, if supported by the back-end
2013-02-06 11:38:03 +01:00
335b6cd060
[tx-robot] updated from transifex
2013-02-06 00:06:28 +01:00
5221ee0c5a
offer change password only when the action is supported by the user backend
2013-02-05 19:26:00 +01:00
cda0780d4b
Remove superfluous append
2013-02-05 14:15:17 +01:00
2ec0c491d4
remove superfluous enabled-app class again
2013-02-05 11:30:18 +01:00
4059959c5f
Merge branch 'master' into fix_addNavigation
2013-02-05 11:09:38 +01:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
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
46e10407f7
Remove padding hack to position users list.
2013-02-04 14:09:32 +01:00
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
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
88ad1e5fbd
Make app icon linkable when enabling app.
2013-02-03 16:02:25 +01:00
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
88f4aced38
Merge pull request #1404 from owncloud/fixing-1276-master
...
fix #1276 - use registerLoadedCallback()
2013-02-01 03:13:23 -08:00
cc73568d68
Updateing -> Updating
2013-02-01 00:51:00 +01:00
402263bd5c
fix #1276 - use registerLoadedCallback()
2013-02-01 00:33:14 +01:00
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
943c0334c1
remove z-index from app labels which caused overlap with top bar
2013-01-31 20:27:39 +01:00
3d5c7ca245
Merge branch 'master' into navigation
2013-01-31 19:28:25 +01:00
a224d80f4d
Sort internal apps above 3rdparty apps
2013-01-31 17:49:58 +01:00
b471177439
Merge pull request #1379 from owncloud/improved_appsmanagement
...
Improved appsmanagement
2013-01-31 08:30:55 -08:00
0dd9e6cb12
Merge pull request #1387 from schiesbn/visual_improvements
...
small visual improvements
2013-01-31 08:30:25 -08:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
85a12970c7
update on translation string
2013-01-31 14:11:31 +01:00
c801b86bc2
Merge pull request #1359 from raghunayyar/navigation
...
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-31 05:01:20 -08:00
3af09f2acf
l10n support for the error dialog added
2013-01-31 10:43:59 +01:00
8a662a6c74
Cleanup string - easier for translators
2013-01-31 10:34:54 +01:00
170cf20298
addapt the css to adjust the change display name filed to the set password field
2013-01-31 09:57:16 +01:00
b978cc8b28
Shorter, Cleaner JS in apps.js
2013-01-31 11:52:56 +05:30
00a30e6651
[tx-robot] updated from transifex
2013-01-31 00:31:28 +01:00
de00111c1f
use on instead of live in users.js
2013-01-30 17:49:02 +01:00
22812c5f0d
replace live() with on() in core js
2013-01-30 17:00:54 +01:00
92921ceefd
make strings translatable
2013-01-30 16:28:41 +01:00
ea5861ed8c
remove leftover code
2013-01-30 15:27:20 +01:00
5e422dea61
fix typo
2013-01-30 14:52:35 +01:00
0dfbd53a6e
Reduced Styling and Image loads as from src and not backgorund.
2013-01-30 19:12:51 +05:30
66cab77b6d
merge master
...
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
2013-01-30 14:36:17 +01:00
284e690737
Merge branch 'master' into navigation
2013-01-30 13:53:43 +01:00
389c4e8415
mark recommended apps. server part not yet fully implemented
2013-01-30 13:39:53 +01:00
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
a7aff48658
Fix indentation
2013-01-30 00:17:41 +01:00
0067ac6ca6
Remove the no longer existing function "isUserVerified"
...
Thx @eMerzh
2013-01-30 00:16:37 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
6659798197
only change display name if the display name from the current user was changed; add correct display name to new user
2013-01-29 22:33:46 +01:00
56c6e6a334
remove debug output
2013-01-29 22:20:47 +01:00
afad6e95db
check permissions before changing the display name
2013-01-29 22:20:15 +01:00
27edbfdf56
added missing changedisplayname.php
2013-01-29 21:52:03 +01:00
e613a68274
remove dubug output
2013-01-29 21:30:04 +01:00
8d0b67e17a
fix typo in variable name
2013-01-29 21:04:11 +01:00
d620495e92
No Image Repetition on Enabling Apps in Navigation Bar
2013-01-30 00:54:23 +05:30
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
4b7b092008
rename Name to Login Name
2013-01-28 17:05:20 +01:00
f3a99f4869
show display name in input field
2013-01-28 17:01:37 +01:00
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
329d965441
merge changes in navigation
2013-01-28 10:52:15 +01:00
b655444709
[tx-robot] updated from transifex
2013-01-28 00:05:43 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
19024de988
typo fixed
2013-01-25 17:44:40 +01:00
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
aed204d420
Defined height for #leftcontent
2013-01-25 20:39:07 +05:30
64e853394c
compare the correct uids
2013-01-25 12:46:32 +01:00
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
48949ba04a
Move appid to external file
2013-01-23 11:21:34 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
8907bdaf7f
Remove uneeded JS
2013-01-22 12:15:46 +01:00
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
d2383338de
External JSON for the Apps
2013-01-21 22:18:42 +01:00
30274ee33e
Move to OC_App
2013-01-21 22:18:11 +01:00
3ed7d5d521
Move isadmin to external file
2013-01-21 21:25:38 +01:00
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
b81a7aa078
fix up content and content-wrapper merge ...
2013-01-18 19:58:50 +07:00
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
09d3db5eb7
new settings menu for new design
2013-01-17 12:45:33 +07:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
65ef780ed6
Fix regression caused by 31b1a73e1f
2013-01-15 22:44:40 +01:00
0da06187f6
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
...
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
fdd667a83c
[tx-robot] updated from transifex
2013-01-15 00:05:10 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
0810d80f8a
Add a closing )
...
Thanks Jenkins!
2013-01-14 20:10:10 +01:00
fef73d96d1
CP fail
2013-01-14 19:51:16 +01:00
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
981fd5e424
[tx-robot] updated from transifex
2013-01-13 00:08:40 +01:00
ad64ce189d
[tx-robot] updated from transifex
2013-01-12 00:10:58 +01:00
b608675938
Merge pull request #1157 owncloud/move-OpenID
...
Move openid.php to apps repo
Conflicts:
settings/routes.php
2013-01-11 22:57:40 +01:00
954b559d48
Merge pull request #994 from owncloud/enhanced_multiSelect
...
Enhanced multiSelect
2013-01-11 10:23:04 -08:00
1f6eb68ef9
Merge pull request #1150 from owncloud/EnableSSL-AdminMenu
...
Add security section to admin settings to enable the HTTPS enforcement
2013-01-11 09:21:08 -08:00
e11b650d2e
Remove OpenID from the router
2013-01-11 17:24:10 +01:00
1631ee4d60
Move to apps repo
...
This belongs to the apps repo.
2013-01-11 17:22:15 +01:00
9b9f5b1a8a
Remove setContentTypeHeader()
...
`OC_JSON::success` and `OC_JSON::error` are calling
`OC_JSON::encodedPrint`, which already sets these headers. So this two
calls are uneeded duplicates.
2013-01-11 17:09:36 +01:00
ffbf273c9a
Removed uneeded HTML tag
2013-01-11 14:43:56 +01:00
466cdab680
Add security section to admin menu
...
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.
The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
d03dce1283
[tx-robot] updated from transifex
2013-01-11 00:06:14 +01:00
912050afa0
[tx-robot] updated from transifex
2013-01-10 00:05:53 +01:00
533f0e8e25
[tx-robot] updated from transifex
2013-01-09 00:05:49 +01:00
b69328e1d1
[tx-robot] updated from transifex
2013-01-08 00:31:36 +01:00
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
7ebfcab49b
Merge branch 'master' into fixing-998-master
...
Conflicts:
lib/helper.php
2013-01-06 12:18:21 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
b5d1dfcdc9
javascript syntax error fixed on the way
2013-01-04 23:38:07 +01:00
594d388ad9
new javascript notification functions used within users.js
2013-01-04 23:37:21 +01:00
90f39cd703
[tx-robot] updated from transifex
2013-01-04 13:23:31 +01:00
3bcdd8c900
[tx-robot] updated from transifex
2013-01-03 00:05:19 +01:00
2d36a20a1d
moving storage calculation code to OC_Helper::getStorageInfo()
2013-01-02 14:35:45 +01:00
ed06070741
omit type attribute in script tag to use fallback (text/javascript)
2013-01-02 12:13:07 +01:00
516464ba94
[tx-robot] updated from transifex
2013-01-02 00:05:14 +01:00
c6064a542c
[tx-robot] updated from transifex
2013-01-01 00:04:42 +01:00
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
329bddab48
[tx-robot] updated from transifex
2012-12-31 00:05:31 +01:00
66e57f5fb1
[tx-robot] updated from transifex
2012-12-30 00:05:52 +01:00
36da34e5f6
Merge pull request #902 from owncloud/storage-wording
...
Storage wording
2012-12-28 23:19:52 -08:00
f922f836ce
Change old variable name $default_quota to $defaultQuota
2012-12-28 19:14:33 -05:00
e9c51b319e
[tx-robot] updated from transifex
2012-12-28 00:20:34 +01:00
27f9ea2abb
[tx-robot] updated from transifex
2012-12-27 00:05:17 +01:00
b7257b2524
[tx-robot] updated from transifex
2012-12-26 00:12:10 +01:00
5d59ac0739
[tx-robot] updated from transifex
2012-12-25 00:11:11 +01:00
7d52c39419
[tx-robot] updated from transifex
2012-12-24 00:12:16 +01:00
0656b41747
[tx-robot] updated from transifex
2012-12-23 00:10:23 +01:00
05fda76776
[tx-robot] updated from transifex
2012-12-22 00:26:25 +01:00
5f795d3aac
Users: Show selected groups first in list.
2012-12-21 06:18:45 +01:00
1d55829ba6
multiSelect: Modified users.js to only update other multiSelects.
2012-12-21 00:54:31 +01:00
7e78f8e15a
moving logic from template to the 'controller'
...
THX @VicDeo
2012-12-21 00:48:12 +01:00
3e39c39d6a
[tx-robot] updated from transifex
2012-12-21 00:11:31 +01:00
24e0a2a358
remove unused code
2012-12-20 15:45:10 +01:00
436df6b67d
enable translations for quota sizes 'none' and 'default'
2012-12-20 15:35:36 +01:00
31aa317952
Merge pull request #970 from owncloud/fixing-950-master
...
within the user administratio page some translations have been missing
2012-12-20 04:15:51 -08:00
cc9061d20d
adding missing translations for various strings + fixing tool tip on delete
2012-12-20 09:59:09 +01:00
ecf82d2218
[tx-robot] updated from transifex
2012-12-20 00:13:09 +01:00
bca02f4b40
[l18n] fixing typos in source text
2012-12-19 23:43:07 +01:00
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
7c5150ce32
Merge pull request #913 from owncloud/fix_settings
...
cleaning up the settings
2012-12-18 15:27:52 -08:00
982e46cd29
[tx-robot] updated from transifex
2012-12-19 00:04:14 +01:00
a4b0df419e
[tx-robot] updated from transifex
2012-12-18 00:14:58 +01:00
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
68562dafb4
More whitespace fixes
2012-12-15 00:43:46 +01:00
2ef2dc4dda
Fix "There must be a single space between the closing parenthesis and the opening brace"
2012-12-15 00:43:46 +01:00
74d41b8b96
dim Default Storage label color a bit
2012-12-14 23:24:51 +01:00
4ee9d39422
change storage space 'none' to 'Unlimited' and capitalize Default
2012-12-14 23:22:55 +01:00
4acb2f70e1
change technical expression 'Quota' to simpler 'Storage'
2012-12-14 23:02:22 +01:00
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
e7c288a719
fixing links docu/ ->doc/
2012-12-14 15:25:52 +01:00
cde74fe248
make it more readable
2012-12-14 14:41:09 +01:00
6d7ae463df
[tx-robot] updated from transifex
2012-12-14 00:17:42 +01:00
2330d6bcc7
show the link to the issue tracker only for Admins as discussed with Björn and Jan.
2012-12-13 11:08:12 +01:00
89bbabd77b
a bit more polish. We are getting there.
2012-12-13 09:26:25 +01:00
f85106b6b5
first version of the new documentation system integration.
2012-12-12 22:41:12 +01:00
f7f462f273
[tx-robot] updated from transifex
2012-12-11 00:04:40 +01:00
a444999a8c
[tx-robot] updated from transifex
2012-12-10 00:12:32 +01:00
e3e4dcf77b
[tx-robot] updated from transifex
2012-12-09 00:12:41 +01:00
69a9fe75a0
[tx-robot] updated from transifex
2012-12-06 00:12:08 +01:00
524f3c3c0b
[tx-robot] updated from transifex
2012-12-05 00:04:55 +01:00
a53a946c20
[tx-robot] updated from transifex
2012-12-04 00:07:11 +01:00
cee92bde20
Merge pull request #682 from VicDeo/master
...
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-03 02:18:04 -08:00
f4d7955fe6
[tx-robot] updated from transifex
2012-12-03 00:05:40 +01:00
6a211f3fa1
Check if we have an array with data. Fix #487
2012-12-02 23:54:54 +03:00
401c56ce7b
[tx-robot] updated from transifex
2012-12-02 00:03:12 +01:00
c7c5e2a2e2
[tx-robot] updated from transifex
2012-12-01 00:03:27 +01:00
a3f18d4b5a
Merge pull request #603 from owncloud/store_plain_groupname
...
Group name doesn't need to be sanitized before storing it in the database
2012-11-30 04:13:36 -08:00
e5af24d084
use attr instead of data
2012-11-29 13:56:07 +01:00
1d1ab2a911
Revert "fix group and subadmin managing for 'ajax-loaded' users"
...
This reverts commit a5774229a1
2012-11-29 13:37:37 +01:00
4c83a4c918
add a client side check
2012-11-28 18:40:58 +01:00
a5774229a1
fix group and subadmin managing for 'ajax-loaded' users
2012-11-28 18:40:00 +01:00
ab13702770
make some checks server-side
2012-11-28 18:15:40 +01:00
1d4d4fd678
[tx-robot] updated from transifex
2012-11-28 00:11:21 +01:00
80d1037e42
Group name does't need to be sanitized before storing it in the database
...
It should only be sanitized before display
2012-11-27 20:22:45 +01:00
d251f04b98
[tx-robot] updated from transifex
2012-11-27 00:10:47 +01:00
7892204077
[tx-robot] updated from transifex
2012-11-26 00:02:04 +01:00
3688376a6f
[tx-robot] updated from transifex
2012-11-23 00:03:17 +01:00
3a5f5e127c
[tx-robot] updated from transifex
2012-11-22 00:02:16 +01:00
9204be827b
[tx-robot] updated from transifex
2012-11-21 00:02:33 +01:00
568def2b61
[tx-robot] updated from transifex
2012-11-20 00:02:08 +01:00
e28d71bf55
[tx-robot] updated from transifex
2012-11-18 00:02:00 +01:00
61670184c4
[tx-robot] updated from transifex
2012-11-17 00:02:24 +01:00
36bf4e24f0
Merge pull request #433 from owncloud/user_setting_fixes
...
User setting fixes
2012-11-15 14:01:16 -08:00
a418a3ba65
[tx-robot] updated from transifex
2012-11-15 00:03:50 +01:00
343e9d8621
Better check and handing of user deletion
2012-11-14 21:52:28 +01:00
59627367ae
Better check and handling of user creation
2012-11-14 21:52:28 +01:00
4eff27ed42
Always have the username as string in user admin
2012-11-14 21:52:28 +01:00
85209a0a00
Cleanup user settings js
2012-11-14 21:52:28 +01:00
9c36326e47
[tx-robot] updated from transifex
2012-11-14 00:03:38 +01:00
ac22cd4ab0
[tx-robot] updated from transifex
2012-11-13 00:07:19 +01:00
910a25adbd
Fix deleting multiple user w-o reloading V2
2012-11-12 20:29:06 +00:00
09d6d843f7
[tx-robot] updated from transifex
2012-11-12 00:02:24 +01:00
9f8cc09642
[tx-robot] updated from transifex
2012-11-11 00:02:42 +01:00
eff13a28c1
Fixed new checkstyle issues in apps.php from build #1341 .
2012-11-10 01:03:54 +01:00
1b7c0c2b62
Fixed new checkstyle issues in ocs.php from build #1341 .
2012-11-10 01:02:47 +01:00
7ec0efe5c2
[tx-robot] updated from transifex
2012-11-10 00:02:29 +01:00
c053863644
Merge pull request #330 from owncloud/check_connection
...
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08:00
b33a443088
[tx-robot] updated from transifex
2012-11-09 10:07:45 +01:00
cb57a20ec2
[tx-robot] updated from transifex
2012-11-09 00:03:49 +01:00
4c06c25c6c
Fix delete link when new user is added
2012-11-08 20:17:16 +00:00
55f75c6d8e
add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why.
2012-11-08 18:08:44 +01:00
2d52365606
Merge pull request #326 from owncloud/add_credits
...
add credits to personal page too so that non admins can see what they run
2012-11-08 05:50:09 -08:00
fef2d07873
add credits to personal page too so that non admins can see what they run.
2012-11-08 14:12:49 +01:00
f799e48f7e
fix the broken image path on the apps page
2012-11-08 13:34:00 +01:00
fbc3123d8e
Correct more data vs attr to fix #189
2012-11-07 23:51:00 +00:00
3e01fe1dbb
[tx-robot] updated from transifex
2012-11-07 00:02:51 +01:00
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
27ab0357ae
Checkstyle: Fix last six NewlineBeforeOpenBrace
2012-11-04 18:36:16 +01:00
0e70ea9d8b
Checkstyle: Fix the last 25 NoSpaceAfterComma
2012-11-04 18:28:29 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
627509875e
[tx-robot] updated from transifex
2012-11-02 00:04:59 +01:00
aca6d3252f
[tx-robot] updated from transifex
2012-10-31 00:02:32 +01:00
9318a9566a
Merge pull request #136 from scambra/users-fixes
...
fix settings' routes
2012-10-29 15:31:37 -07:00
1bdd0c949b
Move and fix app setting navigation detect
2012-10-29 15:04:55 +01:00
1f0bc1713f
fix settings routes
2012-10-29 14:50:03 +01:00
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
1a08ef6a06
[tx-robot] updated from transifex
2012-10-28 00:02:29 +02:00
0120f3fd62
Merge branch 'routing'
...
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
3bef19c623
[tx-robot] updated from transifex
2012-10-27 00:02:05 +02:00
da57fbc93a
show/hide navigation entries after enabling/disabling app
2012-10-26 20:13:24 +02:00
c7d64811d6
[tx-robot] updated from transifex
2012-10-26 02:05:56 +02:00
f33af71eb0
[tx-robot] updated from transifex
2012-10-24 02:08:34 +02:00
95505008ec
box-shadow can safely be used without vendor prefixes
2012-10-23 23:50:11 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
519a0ae4ab
[tx-robot] updated from transifex
2012-10-18 02:09:32 +02:00
6081bfa2bc
Merge branch 'master' into routing
...
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
2012-10-17 16:38:11 +02:00
1c3a36a079
From now on we support two german translation: formal and personal
2012-10-16 23:40:14 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
c3823aa864
[tx-robot] updated from transifex
2012-10-16 02:08:21 +02:00
f4142bd2a8
Move isUserVerified to OC_Util
2012-10-16 00:47:38 +02:00
c404148f9a
Password check for admins
2012-10-16 00:47:38 +02:00
c83a2a5517
Correct check for admin
2012-10-16 00:47:38 +02:00
e6c9f5d9f4
Verify passwords for admins
2012-10-16 00:01:48 +02:00
7e2d4e2a8e
Remove verify user from personal.php
2012-10-15 23:51:22 +02:00
e3054b6201
Revert "Verify user login before changing the password reset mail"
...
This reverts commit 9aa9110fd9
2012-10-15 23:50:12 +02:00
f475ed5cc1
Revert "Remove old password check from changepassword and use verifyUser instead"
...
This reverts commit e6b8153865
2012-10-15 23:49:49 +02:00
9aa9110fd9
Verify user login before changing the password reset mail
2012-10-15 17:44:44 +02:00
e6b8153865
Remove old password check from changepassword and use verifyUser instead
2012-10-15 17:44:44 +02:00
6b39b80648
Change auth checks
2012-10-15 17:44:44 +02:00
0b42d70259
Unneeded double check
2012-10-15 16:08:39 +03:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
4c4fd36bdd
the Shared folder is no longer in the cache
2012-10-13 14:52:49 +02:00
d386bc8737
[tx-robot] updated from transifex
2012-10-13 02:08:50 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
673e3dae3f
[tx-robot] updated from transifex
2012-10-11 02:07:32 +02:00
2f4b1b0e4c
Disallow users to delete their own accounts
2012-10-10 18:05:34 +02:00
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
306bfb44d3
no garbage on the screen please
2012-10-08 13:33:52 +02:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
35c5f71989
[tx-robot] updated from transifex
2012-10-06 02:06:49 +02:00
f3a211c03c
Implement routing on javascript side
2012-10-05 09:42:36 +02:00
167e9c1cc0
Fix route name
2012-10-05 09:41:27 +02:00
7efbdb52f6
don´t show negative numbers. this is only a quickfix. I still dont get why the Shared folder can be bigger than the root folder. Perhaps a inconsitency in the filecache?
2012-10-04 12:58:57 +02:00
5c042d88ad
[tx-robot] updated from transifex
2012-10-04 02:07:35 +02:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
bb136b9adf
Make the settings ajax calls use the router
2012-10-02 18:00:23 +02:00
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
424062f4af
Merge pull request #21 from raghunayyar/master
...
CSS typo fixed.
2012-09-29 08:21:42 -07:00
0ffab9fea8
Update settings/css/settings.css
...
CSS typo fixed.
2012-09-29 20:50:37 +05:30
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
d0bd2bbf27
Convert menu entries of settings pages to use router
2012-09-28 23:20:17 +02:00
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
01160d0fb4
[tx-robot] updated from transifex
2012-09-22 01:18:31 +02:00
8f2c76d3da
[tx-robot] updated from transifex
2012-09-21 02:04:56 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
729b36e495
Fix grammer and dont split translatable string
2012-09-18 21:31:03 +00:00
9df403f051
Added failsafes for retrieving remote apps on settings->apps page, in case categories or app data are not found
2012-09-18 16:55:03 +01:00
dc0dc56d48
Merge branch 'master' of https://github.com/owncloud/core
2012-09-18 14:36:08 +01:00
b765e883f3
Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
...
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
88b786e8dd
Merge branch 'master' into ocs_api
2012-09-17 12:09:34 +00:00
f85b709fae
Use correct translation file
...
every translation within the sub folder 'settings' need to use 'settings' on OC_L10N::get
2012-09-17 15:00:22 +03:00
1fd3c5fbc0
$l was undefined
2012-09-17 14:50:17 +03:00
dbd2dea689
[tx-robot] updated from transifex
2012-09-17 02:07:23 +02:00
4356f8daeb
add a bit more space
2012-09-16 20:31:56 +02:00
158af74b3e
makes cron config layout similar to the sharing one
2012-09-16 12:40:08 -04:00
442f26ea80
structure the settings options a bit better.
2012-09-16 17:23:21 +02:00
6568671bdc
[tx-robot] updated from transifex
2012-09-16 02:03:40 +02:00
fbdefd5601
[tx-robot] updated from transifex
2012-09-15 02:05:52 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
227ada3257
Fix merge conflicts
2012-09-13 10:23:41 +00:00
bb0b438ace
[tx-robot] updated from transifex
2012-09-13 02:03:54 +02:00
54eae53206
Merge branch 'master' of https://github.com/owncloud/core
2012-09-12 12:10:57 +02:00
c0a3bdb757
improve the documentation for the cron config a bit
2012-09-12 12:09:46 +02:00
62d8202d59
return a message when app could not be enabled
2012-09-12 12:02:39 +02:00
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
Thomas Tanghus
Jenkins for ownCloud
Frank Karlitschek
Lukas Reschke
Bart Visscher
Björn Schießle
Bernhard Posselt
Arthur Schiwon
Qingping Hou
Jörn Friedrich Dreyer
Victor Dubiniuk
Jan-Christoph Borchardt
Robin Appelman
Björn Schießle
raghunayyar
Sam Tuke
Georg Ehrke
Michael Gapczynski
Daniel Molkentin
Tom Needham
Tom Needham
Brice Maron
Diederik de Haas
Felix Moeller
Bart Visscher
scambra
Raghu Nayyar
Alessandro Cosentino