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
Thomas Mueller
Jan-Christoph Borchardt
Robin Appelman
Lukas Reschke
Björn Schießle
raghunayyar
Jörn Friedrich Dreyer
Frank Karlitschek
Bart Visscher
Daniel Molkentin
Michael Gapczynski
Tom Needham
Thomas Tanghus
Tom Needham
Victor Dubiniuk
Georg Ehrke
Brice Maron
Diederik de Haas
Felix Moeller