a584022ecc
increment group counters when a user is created
2014-07-09 14:30:39 +02:00
2561ef123b
fix apostrophe fixes #9486
2014-07-08 21:48:29 +02:00
485be909ff
improvements for uninstall button
2014-07-05 13:39:25 +02:00
1b83ac7de2
personal: link straight to /promote as @tomneedham said
2014-07-02 19:29:57 +02:00
4878c734e2
add link to contribute and promote pages in personal settings
2014-07-02 17:41:26 +02:00
720fa33274
Better Logic to display user count for everyone.
2014-06-24 00:50:36 +05:30
85894654ae
Make sure last seen tooltip always appears even after searching and filtering
2014-06-19 14:30:22 +02:00
9e74787c8a
Migrate table layout to p layout for share settings
...
ref #8906
2014-06-17 14:33:14 +02:00
c42d087fc5
Merge pull request #9053 from owncloud/small_ux_improvement
...
share settings, small ux improvement
2014-06-16 20:18:51 +02:00
15c215cd03
Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
...
Make shipped apps updatable via appstore
2014-06-16 15:54:50 +02:00
c1ef536896
show explenation only if the setting is activated
2014-06-16 15:33:46 +02:00
01de7b8b9e
Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
...
migrate table layout to paragraph layout for HTTPS setting
2014-06-14 13:08:58 +02:00
fd5fad194d
remove double space
2014-06-14 01:03:03 +02:00
dc2212cd46
migrate table layout to paragraph layout for HTTPS setting
2014-06-13 16:54:47 +02:00
f5da0052cf
fix mail settings save function - ref #8854
2014-06-13 15:31:35 +02:00
23c83c076c
unify controls bar, remove duplicate from user management
2014-06-06 12:22:09 +02:00
0fe8f77c17
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
settings/templates/apps.php
2014-06-05 22:54:27 +02:00
6578f00b4b
unify share settings
2014-06-05 15:49:34 +02:00
cf9099c788
This settings doesn't belong together
...
Revert "make reshare settings foldable"
This reverts commit c01f196f72
2014-06-05 15:44:56 +02:00
c991e148a6
improve share settings working
2014-06-05 15:44:55 +02:00
bc47e56f9f
fix related layout issues in user management
2014-06-04 16:24:39 +02:00
cdf8a123e7
Merge pull request #8264 from owncloud/app-enable-by-group
...
Add the option to enable apps only for specific groups
2014-06-03 19:01:12 +02:00
cfc1d5623e
Merge pull request #8840 from owncloud/share_settings
...
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
a5dd8e84f1
Merge pull request #8827 from owncloud/add-sqlite-info
...
add info about sqlite on setup page
2014-06-03 15:07:59 +02:00
79b3558c6d
Merge pull request #7151 from owncloud/user-jquery
...
Continuing the New User management
2014-06-03 15:04:30 +02:00
a3202f1f03
bring back the line breaks
2014-06-03 12:48:36 +02:00
de012667c7
Apps: fix wording and layout for 'enable only for specific groups'
2014-06-03 12:42:36 +02:00
402a31f196
adding some line breaks
2014-06-03 12:42:36 +02:00
53dc30af4f
Add option to enable app for specific groups
2014-06-03 12:42:35 +02:00
25c676f203
simplify SQLite warning
2014-06-03 12:02:23 +02:00
5097bcc16d
improve settings name
2014-06-03 11:29:51 +02:00
68a4fd44e6
add notification on admin page
2014-06-03 08:01:39 +02:00
c84b226cb5
add arrow icon for external links
2014-06-02 23:18:25 +02:00
2e6a27614e
move Help section from controls bar to sidebar
2014-06-02 22:59:16 +02:00
39982c2aea
fix grouplist behaviour (blank after filtering)
2014-06-02 17:32:59 +02:00
6f4bdbdb94
Merge pull request #8784 from owncloud/fold-reshare-settings
...
make reshare settings foldable
2014-06-02 14:37:10 +02:00
ec572607e1
remove group rename stuff, there is not support in the backends yet. to do for oc8.
2014-06-02 12:53:59 +02:00
29ef2f7a2f
user mgmt: hide group rename function because it’s not supported in the backend yet
2014-06-02 12:53:59 +02:00
4de14fe6da
Javascript cleanup for groups.
2014-06-02 12:53:58 +02:00
c38548a1aa
Rebase cleanup.
...
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
2014-06-02 12:53:58 +02:00
1115d68f25
Fix broken span.
2014-06-02 12:53:58 +02:00
097887a659
Add the admin group to the group list data.
...
Fixes the admin group disappearing from the list when updating the display as the result of a search.
This group data should probably be managed on the page entirely by the javascript GroupList object, but this seems like the interim method.
2014-06-02 12:53:58 +02:00
747c011615
More specific selectors, javascript cleanup.
...
* Assigned jQuery selector results to variables for speed.
* Moved all .attr('data') calls to .data() calls.
* Added :data(uid) selector.
* Split the multiselect checkhandlers into separate functions.
* De-duped click event on password change/img.
* Used fluent interface on jQuery object for event binding.
* Removed redundant tag names in class selectors.
* Fixed incorrect date display for last login.
* Added Userlist.has() to search for uid.
* General code convention compliance fixes.
to-do: Group dropdowns currently don't add the admin group after the search result, not sure why yet.
2014-06-02 12:53:58 +02:00
57cc51d21d
user management: remove autocompletion of user/password fields, fix #8464
2014-06-02 12:53:58 +02:00
66d00cf782
user management: remove unneeded and erroneous user filter reset function
2014-06-02 12:53:57 +02:00
b56d14260d
Rename $isadmin to $isAdmin
2014-06-02 12:53:57 +02:00
a9bd416643
add reset button for the filter field
2014-06-02 12:53:57 +02:00
3ff123f247
more appropriate label
2014-06-02 12:53:57 +02:00
3e411c82a5
unify and consolidate group fetching method for initial template fill and ajax request
2014-06-02 12:53:56 +02:00
08ad073cf5
make string translatable
2014-06-02 12:53:56 +02:00
249e42c4cd
enable group filtering
2014-06-02 12:53:55 +02:00
d3cee79b5a
Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist.
2014-06-02 12:53:55 +02:00
a4cfa95545
restructure group.js and put functions to object, also add group list sorting after adding.
2014-06-02 12:53:54 +02:00
faab6c095c
move group-click initialization to groups.js and only react on elements with a data-gid attribute given
2014-06-02 12:53:54 +02:00
65aa20433c
Enhancement : Toggle Add Group on Click, @blizzz have a look here.
2014-06-02 12:53:53 +02:00
17e640af22
set admin gid to Admins filter. I.e. hard-coding the admin group, but this is OC reality atm - other admin groups are not possible.
2014-06-02 12:53:53 +02:00
b3221f0e4e
LDAP: adjust main template according to PR 7291
2014-06-02 12:53:53 +02:00
eed108ec1b
Enhancement : The edit icon looks like files app rename fileaction.
2014-06-02 12:53:53 +02:00
ceb6c4df04
Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions.
2014-06-02 12:53:53 +02:00
f7903e92be
do not forget to pass parameters to subtemplate
2014-06-02 12:53:52 +02:00
63645461f0
Fixes Markup in templates.
2014-06-02 12:53:52 +02:00
9ba4a76214
resolving conflict when picking 8b81a0b
2014-06-02 12:53:52 +02:00
bf88bd108e
do not show 0 when administered group has no users
2014-06-02 12:53:52 +02:00
7d3ac194e3
do not show 0 when group has no users
2014-06-02 12:53:52 +02:00
e681e1eec0
Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group
2014-06-02 12:53:51 +02:00
3a92d48104
reduce template function calls
2014-06-02 12:53:51 +02:00
57ffaddf26
add Last Login column
2014-06-02 12:53:51 +02:00
970f899726
Initial Commit : Changes Storage to Quota, Implements GroupName editing.
2014-06-02 12:52:53 +02:00
dc28f58951
add Storage Location col
2014-06-02 12:52:53 +02:00
dc1523355b
Adds Admin to Grouplist Everywhere
2014-06-02 12:52:53 +02:00
4a30665ec3
Removes Delete Icon from Admin Group.
2014-06-02 12:52:53 +02:00
8e4bbe8297
Adds class button to fix font sizes.
2014-06-02 12:52:53 +02:00
8e34316e04
Fixes User Search by username.
2014-06-02 12:52:53 +02:00
c7af9cd6dd
Initial Commit : User Search, Fixes Typos
2014-06-02 12:52:53 +02:00
71160ff853
Deletes Group Clientside Effectively.
2014-06-02 12:52:52 +02:00
ce46cd3680
Implements Group Creation from Sidebar
2014-06-02 12:52:52 +02:00
b506388b75
Reverts last commit, implements user in group count.
2014-06-02 12:52:52 +02:00
43ced8c6c7
Splits Controls overlap in files and users.
2014-06-02 12:52:52 +02:00
0663d954e6
resolve conflicts while picking c0fb623
2014-06-02 12:52:52 +02:00
020255b4e5
add button for properly uninstalling apps
2014-05-31 17:50:39 +02:00
555b9cc245
Merge pull request #7614 from owncloud/test_annotations_working
...
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
5cd0fd2559
Merge pull request #8700 from owncloud/design-smallfixes
...
Design detail fixes
2014-05-29 21:54:15 +02:00
c01f196f72
make reshare settings foldable
2014-05-29 21:14:20 +02:00
1a22478446
reverts 188c543 and translates only mail
2014-05-27 12:58:46 +02:00
188c5435d8
unwrapped strings fix
2014-05-27 03:48:24 +02:00
c6c4bb62e1
move saved notification for mail server, so it's smaller
2014-05-23 18:09:45 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
9ccb3279dd
Added app navigation for files app
...
- Added links to trashbin and shared dir
- Moved "WebDAV" settings block to the app nav's settings section
- Added sidebar support in trashbin app as well
2014-05-15 17:51:04 +02:00
dab3cb65cf
Merge pull request #8522 from owncloud/sharing_ux_improvements
...
Sharing ux improvements
2014-05-14 12:54:27 -04:00
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
ec045b251c
hide input field if default expire date isn't activated
2014-05-13 11:28:25 +02:00
b7981910f7
adopt new settings style
2014-05-09 22:53:01 +02:00
287c8981bc
Check if ReflectionMethod::getDocComment is working
2014-05-09 22:44:55 +02:00
ad1265da13
typo fix, by translators on transifex
2014-04-25 16:26:30 +02:00
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
54476c468c
fix spelling 'Allow user ...' -> 'Allow users ...'
2014-04-22 09:34:08 +02:00
b2f8e34388
Remove uneeded file
...
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
bd2cf6ee29
Merge pull request #7817 from owncloud/app-navigation-for-apps
...
Makes #app-navigation a part of app management.
2014-04-01 21:38:43 +02:00
69be5bdbd8
replace personalblock fieldset with section div in admin and personal settings
2014-03-27 17:00:47 +01:00
dda7129a24
Merge branch 'master' of https://github.com/owncloud/core into last_cron_log
2014-03-21 20:23:31 +01:00
59d1ee565e
Makes #app-navigation a part of app management.
2014-03-20 13:34:50 +05:30
b75ca9fb50
Display admin option for public upload with encryption enabled
...
Now that public upload works with encryption, the admin option to toggle
it must be made visible.
2014-03-18 11:28:56 +01:00
5fcfb2ef84
Merge pull request #7564 from owncloud/issue/7559
...
Hide QMail when not selected and hide SendMail when not available on the server
2014-03-12 18:32:38 +01:00
556c6eca23
Use OC_Util::formatDate()
2014-03-12 17:53:39 +01:00
c5440fa133
Move cron status to the right of the heading
2014-03-12 17:29:26 +01:00
547b563464
Log last cron execution
...
Fixes #2012
2014-03-12 15:20:51 +01:00
5713b0dedb
Authentification -> Authentication
2014-03-11 16:24:50 +01:00
0285d5b6e2
Hide QMail when not selected and hide sendmail when not available on the server
...
Fix #7559
2014-03-05 14:53:20 +01:00
d583d61b69
Merge pull request #7412 from owncloud/issue/7175
...
Add button to send a test mail after changing the email settings
2014-03-05 13:18:41 +01:00
5b8cde48dc
Add button to send a test mail after changing the email settings
...
Fix #7175
2014-03-05 10:01:34 +01:00
af2c2b3a16
update wording of email field
2014-03-04 10:22:54 +01:00
e78da036c1
profile image: relabel technical 'Abort' to more widely used 'Cancel'
2014-02-28 10:09:34 +01:00
d9a153dbe9
Merge pull request #7174 from owncloud/issue/7166
...
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
9847912257
Remove unused variables, add doc blocks and break lines
...
Fix #7166
2014-02-26 13:10:46 +01:00
331bd527a7
Hide SMTP options based on selected send mode
...
Fix #7166
2014-02-26 10:30:22 +01:00
16262e3fd2
Move isadmin to template and rename it to oc_isadmin
2014-02-19 17:56:12 +01:00
8387cd8ae3
Add option to change email settings in admin section
...
Fix issue #7166
2014-02-18 14:26:03 +01:00
dafa8fc37e
do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete
2014-02-18 10:58:00 +01:00
61aa6ead83
Merge pull request #6490 from owncloud/theming-for-appstemplate
...
do not show 'Add app' and 'More apps' for themed ownCloud
2014-02-05 16:49:07 +01:00
d182b4f59f
Merge pull request #6927 from owncloud/enc_dont_reload_page_on_decrypt
...
remove the form, it isn't needed here
2014-01-27 04:30:06 -08:00
150d3856a0
prevent autofill for password change settings, prevent leak of existing password, fix #6552
2014-01-24 18:58:56 +01:00
2a3cb7ac5b
remove the form, it isn't needed here
2014-01-24 11:41:24 +01:00
80d871ab1e
added website field
2014-01-17 16:35:48 +01:00
e2de3b8337
distinguish app links from doc links
2014-01-17 16:08:32 +01:00
bf0471a92e
show link to app documentation
2014-01-17 14:56:25 +01:00
d36da7e43a
use appstoreenabled config switch
2014-01-16 12:58:17 +01:00
5c1a9f35f1
Indicate password strength using strengthify
...
* uses zxcvbn
* outsourced to separate jquery plugin
* async loading
* hide strength meter if input is empty
* feedback if user enters weakest password
* fade in and out
* show tipsy with strength
* Opera 12, IE8-10, FF 23, Chromium 29
2014-01-15 11:10:12 +01:00
3c21fd5bfc
do not show 'Add app' and 'More apps' for themed ownCloud
2013-12-18 14:59:57 +01:00
61296ed7bb
lower required php version to 5.3.3
2013-12-04 10:25:22 +01:00
8506d2bf42
fix wording
2013-11-27 00:38:56 +01:00
2d822e3b95
add warning for HTTP connection
2013-11-27 00:05:48 +01:00
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
f1f172e16e
fix typo
2013-11-25 11:09:31 +01:00
f6df4b349f
remove logic from template and fix syntax error
2013-11-24 21:27:32 +01:00
77bb168007
replace echo with p
2013-11-24 17:17:10 +01:00
22e39baf77
show the build number if on the daily build update channel
2013-11-24 16:46:07 +01:00
8ccac86c98
Enable user backends to provide avatar images
2013-11-22 13:25:20 +01:00
cd1cf58875
Fixing the warning notifications
2013-11-21 14:44:25 +01:00
368342a085
Update error messages
2013-11-15 14:46:00 +01:00
d62b683c6a
change 'Display Name' to more understandable 'Full Name', fix #5612
2013-11-06 14:20:43 +01:00
ea4dfa7e38
Merge pull request #5638 from owncloud/admin-quotafield
...
Improve quota input field
2013-10-31 04:25:42 -07:00
680f4963dc
fix translation strings
2013-10-31 12:21:42 +01:00
9d230bcc75
Improve quota input field
...
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
2013-10-30 20:46:53 +01:00
aba7335d3f
Changed wording in log level dropdown
2013-10-30 18:39:21 +01:00
e3b13b13c9
Changed log level labels in log level dropdown
2013-10-30 18:23:48 +01:00
148d2616e5
introduce link_to_docs() and migrate links
2013-10-21 21:29:45 +02:00
44d15d497e
change the language
2013-10-20 15:22:50 +02:00
37b89b11b6
harmonize this with the documentation. Once every minute is way to often. Every 15min should be fine just as the documentation suggests: http://doc.owncloud.org/server/5.0/admin_manual/configuration/background_jobs.html
2013-10-19 01:42:59 +02:00
7cf81f2d12
show the channel. Also mark git as git channel so that someone can see where this build comes from
2013-10-13 21:51:47 +02:00
3f54e3c783
Merge pull request #5299 from owncloud/settings-ie8-tablegridstyles
...
Fixed table grid styles for IE8
2013-10-12 03:51:01 -07:00
fce198874f
Merge pull request #5272 from mrflix/master
...
fix label to checkbox binding in admin -> force-https
2013-10-12 01:41:30 -07:00
1a05ed2f38
Fixed table grid styles for IE8
...
The selector :not() isn't supported in IE8, replaced it with the "grid"
class.
- Fixes the log table style in IE8 (#5057 )
- Fixes the users table layout bug in IE8
2013-10-11 15:58:15 +02:00
02c7f95687
Includes <optgroup> tag
2013-10-11 18:52:27 +05:30
7c2f1fd580
Puts the language divider in place. thanks @Kondou-ger ;)
2013-10-11 18:46:59 +05:30
4b2bb11716
Removes the Bogus Label
2013-10-11 18:42:02 +05:30
e27bb660bd
Uniform Styles and Indentation Fixes for Personal Block
2013-10-11 18:03:53 +05:30
01d3536a76
fix checkbox <-> label binding
...
clicking the label will trigger the checkbox
2013-10-10 23:10:06 +02:00
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
1832eb8872
Pass view in \OC_Avatar to constructor and use $_ for enable_avatars
2013-09-09 16:57:46 +02:00
15ab798353
Fix an IE8 bug with the avatarcropper.
...
1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
2013-09-05 19:26:02 +02:00
4724d60ecd
Partly fix cropper in IE8 and don't use a dialog for it
2013-09-03 17:40:41 +02:00
3ce4bf5ec7
use css class hidden to hide setting elements
2013-09-02 17:14:11 +02:00
e7e3f1b81a
Fix some of @jancborchardt's complaints in oc_avatars
2013-09-02 17:07:38 +02:00
76b1b5b6a3
Provide 'enable_avatars' in config.php, to disable avatars
2013-09-01 18:17:14 +02:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
0c708be76b
Use defaultavatars
2013-08-29 14:26:11 +02:00
67c5be9f19
Merge branch 'master' into oc_avatars
...
Conflicts:
3rdparty
2013-08-28 16:44:11 +02:00
0c02e1efef
Merge pull request #4563 from owncloud/use_personal-password
...
Use personal-password for the password name in personal.php
2013-08-28 06:23:13 -07:00
e6473e6d49
Clean up some cruft
2013-08-26 17:41:19 +02:00
31736a1df3
Have a controller instead ofo avatar.php and fix some cropper-design
2013-08-26 16:46:55 +02:00
9a8908b643
Use Jcrop, have inline errormsg, work on cropping, clean up, WIP
2013-08-25 21:06:44 +02:00
81cadd5ea3
Remove gravatar and no-avatar functionality, prepare for default avatars even more and reword some stuff
2013-08-25 21:06:02 +02:00
0a4febf1eb
Integrate newavatar.php into avatar.php by using GET, POST & DELETE
2013-08-25 21:06:01 +02:00
cd2f7bdaef
Deny access for non-users and add a (not-working) override button
2013-08-25 21:06:01 +02:00
9c12da6a94
Several improvements
...
- Don't use gravatars default avatars
- Use "profile image" instead of "avatar"
- Use <p> instead of tables
- Ease updateAvatar()
- Actually return something in \OCP\Avatar
2013-08-25 21:05:40 +02:00
d7e6c77e20
Have a fancy uploadavatar button
2013-08-25 21:05:40 +02:00
33827d690e
Use avatar.php in user-management
2013-08-25 21:05:38 +02:00
131d0edab6
Show avatar on personal.php always (except if avatars are disabled)
2013-08-25 21:04:49 +02:00
4521b54c67
Have /avatar.php as a central avatar-point
2013-08-25 21:04:49 +02:00
252548c62c
Improve styling & enable avatar-upload at personal page
2013-08-25 21:04:45 +02:00
fac671b14e
Modularize get(), async getAvatar, avatars @ usermgmt
...
And other small improvements
2013-08-25 21:04:04 +02:00
4a08f7d710
Add basic avatars and gravatar
2013-08-25 21:02:43 +02:00
fbe7a68ce8
Use personal-password for the password name in personal.php
...
Fix #4491
2013-08-24 14:31:32 +02:00
0ce35af02a
Merge branch 'master' into improve_app-management
...
Conflicts:
settings/js/apps.js
2013-08-21 19:20:25 +02:00
de949b1caa
Merge pull request #4447 from owncloud/fix_4351_master
...
Use JSON to send/receive group data.
2013-08-20 02:49:48 -07:00
7c296a6cf9
Move .errormsg from settings-css to .warning in core. Reusable!
2013-08-18 17:37:22 +02:00
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
cd7e57e8ec
Use JSON to send/receive group data.
...
Squashed commits from PR #4364 for master.
2013-08-15 06:19:40 -04:00
8eaa0e7336
remove table layout for background jobs
2013-07-31 10:04:02 +02:00
b6fa0e4eef
working decrypt files method
2013-07-29 17:06:05 +02:00
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
92af840a51
Merge branch 'master' into css_cleanup_kondou
...
Conflicts:
core/css/styles.css
settings/templates/personal.php
2013-07-24 20:35:00 +02:00
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
840e96cda3
Merge branch 'master' into disable-anon-upload-master
...
Conflicts:
settings/templates/admin.php
2013-07-22 11:55:20 +02:00
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
05084e03a0
Use !== and === in settings.
2013-07-21 13:55:25 +02:00
2964027cad
Merge branch 'disable-anon-upload-master' of github.com:owncloud/core into disable-anon-upload-master
2013-07-14 22:00:42 +02:00
79d23463f8
No admin option to enable public upload in case encryption is enabled
...
No upload on pubic page if public upload is disabled
2013-07-14 21:58:08 +02:00
995feea42a
Use transifex.com on link to translations
2013-07-14 11:54:39 +02:00
7a44d45714
change anonymous to public
2013-07-12 21:34:38 +02:00
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
7741ca0bcc
use themable strings for admin page, simplify admin export, fix rest of #3791
2013-07-11 17:41:36 +02:00
4818e0062e
General CSS cleanup
2013-07-09 16:08:32 +02:00
9b9ea7cd8e
Merge https://github.com/owncloud/core/pull/3827
...
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308fcb5811b7b0e3e6#3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
2013-07-08 10:07:57 +02:00
5f2378be5b
revert changes which where introduced by accident during merge 23cc69b816
2013-07-04 12:06:36 +02:00
3c691c9ec9
move to non-static OC_Defaults
...
Conflicts:
lib/mail.php
2013-07-04 10:11:16 +02:00
d46e62886a
Add init funtion to OC_Defaults to be able to wrap translatable strings
2013-07-04 10:09:28 +02:00
a20e9dee89
Merge pull request #3894 from owncloud/ie8_compatibility_fixes
...
Ie8 compatibility fixes
2013-07-01 11:57:29 -07:00
87bbdc1ed9
check for updates only in the community edition
2013-07-01 10:46:16 +02:00
23cc69b816
construct the foother in defaults.php so that we use always the same footer
...
Conflicts:
settings/templates/admin.php
2013-07-01 10:46:00 +02:00
d110e60316
Hide a ghost image on the apps management page
2013-06-28 21:53:56 +03:00
4dd0076e7c
Users page: username instead of login name as col header to avoid confusion with other backends
2013-06-18 14:32:28 +02:00
7889f2ef5c
Merge pull request #3687 from owncloud/template_updates
...
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
a178de8501
Merge pull request #3677 from owncloud/apps-buttons
...
remove App management top bar and move buttons more contextually in the interface
2013-06-13 01:44:48 -07:00
63472aed3f
Merge branch 'template_updates' of github.com:owncloud/core into template_updates
2013-06-12 17:26:38 +02:00
2e1836c1da
don't show translation hints in enterprise edition
2013-06-12 17:07:43 +02:00
f565e4c25b
move common settings footer fieldset out of conditional
2013-06-12 16:59:23 +02:00
e1e798c623
make footer and urls aware of ownCloud editions
2013-06-12 15:44:11 +02:00
4cafe21aa4
apps management: change misleading + to ...
2013-06-12 14:49:23 +02:00
c0568e0443
remove App management top bar and move buttons more contextually in the interface
2013-06-12 13:36:17 +02:00
b014509f41
move storage bar below clients showcase to make it more visible
2013-06-11 16:05:02 +02:00
97e05b71f8
add hint about what the recovery password field is for
2013-06-06 12:26:05 +02:00
f314eb8f72
The "lost password" field depends on OC_USER_BACKEND_SET_PASSWORD
...
so it should only be visible for users with a supporting backend.
2013-05-25 09:03:07 +02:00
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
135991474b
fix inconsistent post parameters in change password operation
2013-05-08 12:38:09 +02:00
2bcb64e781
Merge pull request #3114 from owncloud/update-notification
...
Add an update notification
2013-04-26 21:12:38 -07:00
d825669265
Merge pull request #3002 from owncloud/priorize_common_languages
...
Priorize common languages.
2013-04-26 06:30:59 -07:00
e6f84397aa
Merge pull request #3098 from jerrac/displaynamesaveontimeout
...
On the Personal Settings page, made the display name save like the email address saves
2013-04-25 14:10:16 -07:00
d41b600725
Add an update notification on every page for admin users
2013-04-24 18:47:38 +02:00
e8bb998ecc
Fix #3095 .
2013-04-24 11:13:12 +02:00
7312cbec91
Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages.
2013-04-23 12:45:12 -07:00
7a2be0c5dc
Make divider not selectable
...
Very hacky
2013-04-19 00:39:42 +02:00
79218be1d2
Priorize common languages.
2013-04-18 15:14:42 +02:00
4679e789e1
also adjust template properly for log date fix
2013-04-17 15:31:05 +02:00
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
3d008b2ff3
New Password in Personal Password Page loads fine.
2013-04-11 12:34:46 +05:30
27f710d860
Users: fix "Other.." quota option for the default quota
2013-04-09 12:47:08 +02:00
8000f9db74
Unescape the update hint
...
Fixes #2647
2013-04-02 16:39:21 +03:00
df74c0e43a
apply code review hints
2013-03-28 15:02:31 +01:00
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
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
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
c71fdf04d7
fixes 1933 - the locale name is no longer part of the translation string
2013-02-27 11:41:50 +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
c5f6a77dbd
Correct new password input name
2013-02-18 21:15:32 +03:00
e8190c6511
fix user delete button not showing in IE, another SVG replacement issue
2013-02-14 13:01:51 +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
e68e5cc849
Split editable select code used for quota selection into a jquery plugin
2013-02-11 15:18:14 +01: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
45a4016878
Merge pull request #1552 from raghunayyar/personalpage-style-fix
...
Personal Page Password Toggle Loads Fine.
2013-02-10 07:31:05 -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
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
f8335c4815
moved iframe height and width fix from js to css
2013-02-09 11:34:25 +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
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +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
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
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
0a16d25724
make it possible to modify the links to the clients
2013-02-06 15:20:43 +01:00
9d73e7eb1e
let the user change his display name, if supported by the back-end
2013-02-06 11:38:03 +01:00
5221ee0c5a
offer change password only when the action is supported by the user backend
2013-02-05 19:26:00 +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
b471177439
Merge pull request #1379 from owncloud/improved_appsmanagement
...
Improved appsmanagement
2013-01-31 08:30:55 -08: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
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
389c4e8415
mark recommended apps. server part not yet fully implemented
2013-01-30 13:39:53 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08: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
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
64e853394c
compare the correct uids
2013-01-25 12:46:32 +01:00
48949ba04a
Move appid to external file
2013-01-23 11:21:34 +01:00
8907bdaf7f
Remove uneeded JS
2013-01-22 12:15:46 +01:00
d2383338de
External JSON for the Apps
2013-01-21 22:18:42 +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
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
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +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
e475c26f1a
fixing <input> tag
2013-01-07 21:23: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
ed06070741
omit type attribute in script tag to use fallback (text/javascript)
2013-01-02 12:13:07 +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
36da34e5f6
Merge pull request #902 from owncloud/storage-wording
...
Storage wording
2012-12-28 23:19:52 -08:00
7e78f8e15a
moving logic from template to the 'controller'
...
THX @VicDeo
2012-12-21 00:48:12 +01:00
436df6b67d
enable translations for quota sizes 'none' and 'default'
2012-12-20 15:35:36 +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
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
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
cde74fe248
make it more readable
2012-12-14 14:41:09 +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
6a211f3fa1
Check if we have an array with data. Fix #487
2012-12-02 23:54:54 +03: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
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
fef2d07873
add credits to personal page too so that non admins can see what they run.
2012-11-08 14:12:49 +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
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00: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
e6b8153865
Remove old password check from changepassword and use verifyUser instead
2012-10-15 17:44:44 +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
729b36e495
Fix grammer and dont split translatable string
2012-09-18 21:31:03 +00: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
88b786e8dd
Merge branch 'master' into ocs_api
2012-09-17 12:09:34 +00: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
227ada3257
Fix merge conflicts
2012-09-13 10:23:41 +00:00
c0a3bdb757
improve the documentation for the cron config a bit
2012-09-12 12:09:46 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
a2b6a92107
Disable asking to save password when adding users.
2012-09-05 17:22:03 +02:00
685f03edf6
fixing translation - thx eMerzh
2012-09-04 23:49:43 +02:00
409ede0975
Update settings/templates/users.php
...
respect coding style
2012-09-04 13:05:09 +03:00
f3e330ce64
Update settings/templates/help.php
...
respect coding style
2012-09-04 13:03:51 +03:00
0fa254508d
dont use shorthand php tags
2012-09-01 16:38:23 +02:00
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
Arthur Schiwon
Volkan Gezer
Georg Ehrke
Jan-Christoph Borchardt
raghunayyar
Morris Jobke
Bjoern Schiessle
Lukas Reschke
icewind1991
Thomas Müller
Robin Appelman
Morris Jobke
ringmaster
Volkan Gezer
Vincent Petry
Thomas Tanghus
kondou
Joas Schilling
Frank Karlitschek
Bart Visscher
Felix Niklas
rolandgeider
Victor Dubiniuk
Björn Schießle
zafi
David Reagan
Bernhard Posselt
Jörn Friedrich Dreyer
Georg Ehrke
Michael Gapczynski
Tom Needham
Tom Needham
Felix Moeller
Sam Tuke
Alessandro Cosentino