e2c935d6fb
increase/decrease everyone count on user creation/deletion
2014-07-09 14:32:10 +02:00
5e5a02cc2f
decrease user count in affected groups after user delete
2014-07-09 14:30:39 +02:00
a584022ecc
increment group counters when a user is created
2014-07-09 14:30:39 +02:00
6e2e0108ee
[tx-robot] updated from transifex
2014-07-09 01:55:51 -04:00
2561ef123b
fix apostrophe fixes #9486
2014-07-08 21:48:29 +02:00
20fc4b8b53
[tx-robot] updated from transifex
2014-07-08 01:55:17 -04:00
ec4cb56bd7
Merge pull request #9505 from stephane84/fix-9497
...
Refocus input field after user creation
2014-07-07 23:11:23 +02:00
179a707e29
Fixes #9497
2014-07-07 18:32:51 +02:00
a26370e585
Merge pull request #9479 from stephane84/fix-9147
...
Log table design glitch in date field
2014-07-07 11:27:56 +02:00
6e9905d7cf
[tx-robot] updated from transifex
2014-07-07 01:54:28 -04:00
d3e65bc974
Merge pull request #9469 from owncloud/replace_uninstall_button_with_link
...
improvements for uninstall button
2014-07-06 23:56:44 +02:00
e6cea04a30
Bug 9147 owncloud/core
...
Added class="date" in the latest column of the log table to get everything on one line (in the ajax request).
2014-07-06 16:15:33 +02:00
33492b4448
[tx-robot] updated from transifex
2014-07-06 01:54:33 -04:00
485be909ff
improvements for uninstall button
2014-07-05 13:39:25 +02:00
23e0ef6ed0
[tx-robot] updated from transifex
2014-07-05 01:56:33 -04:00
e4a3f8d3c4
[tx-robot] updated from transifex
2014-07-04 01:56:01 -04:00
dc15223edf
Merge pull request #9390 from owncloud/fix-9368
...
Revert 'hides table header while users load.'
2014-07-03 13:00:40 +02:00
1a1c5aa3c0
[tx-robot] updated from transifex
2014-07-03 01:56:24 -04:00
5a7b58ac45
Merge pull request #9374 from owncloud/link-contribute-promote
...
add link to contribute and promote pages in personal settings
2014-07-02 23:36:43 +02:00
bbea031090
Revert "hides table header while users load."
...
This reverts commit 0dc12a3737
2014-07-02 22:56:26 +02:00
03fbd6d540
remove shadow effects from settings icons, reduce size
2014-07-02 19:50:58 +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
9933b33166
[tx-robot] updated from transifex
2014-07-02 01:55:17 -04:00
ff416eaa57
Merge pull request #9330 from owncloud/jumpingheader
...
Hides table header while users load in User Management
2014-07-01 15:43:31 +02:00
0dc12a3737
hides table header while users load.
2014-07-01 17:05:44 +05:30
1b871da59e
Fixes typo with sendmail detection - fixes #9203
2014-06-30 15:01:12 +02:00
d94d307f52
Merge pull request #9207 from owncloud/prevent-default-for-mail-test
...
Fix test mail behaviour
2014-06-30 11:22:20 +02:00
589f68ebf6
[tx-robot] updated from transifex
2014-06-30 01:54:47 -04:00
ebf93448f2
[tx-robot] updated from transifex
2014-06-29 01:56:00 -04:00
26d0978993
[tx-robot] updated from transifex
2014-06-28 01:54:54 -04:00
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
a5154450cf
[tx-robot] updated from transifex
2014-06-26 01:54:40 -04:00
6e2aaaaa31
Fix test mail behaviour
...
* ref #8854
* prevent default of "send test mail" button
* drop unused form serialization
* use display name of user for test mail
2014-06-25 15:32:40 +02:00
b1116880f8
[tx-robot] updated from transifex
2014-06-25 06:33:53 -04:00
c6bcb07f83
Merge pull request #9145 from owncloud/everyonecount
...
Enhancement: Displays users and admin count in the Users Management.
2014-06-24 20:58:35 +02:00
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
720fa33274
Better Logic to display user count for everyone.
2014-06-24 00:50:36 +05:30
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -04:00
ca96b9d3d5
[tx-robot] updated from transifex
2014-06-20 01:54:32 -04:00
85894654ae
Make sure last seen tooltip always appears even after searching and filtering
2014-06-19 14:30:22 +02:00
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
baf46c74cd
[tx-robot] updated from transifex
2014-06-18 01:55:13 -04:00
9e74787c8a
Migrate table layout to p layout for share settings
...
ref #8906
2014-06-17 14:33:14 +02:00
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
dd2dd7eaae
Merge pull request #9059 from owncloud/simplify-warning-layout
...
simplify security warning on admin page
2014-06-16 21:30:46 +02:00
a5f1846170
simplify security warning on admin page
2014-06-16 20:25:02 +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
f12c4f6d11
style
2014-06-16 13:46:31 +02:00
3ebb1565a7
escape before output, fixes #9041
2014-06-16 13:44:41 +02:00
83b45926ee
Merge pull request #8716 from owncloud/forget-documentation
...
app manager forgets the documentation links workaround for #8081
2014-06-16 12:24:39 +02:00
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04: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
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
fd5fad194d
remove double space
2014-06-14 01:03:03 +02:00
c378e76412
skip certain tests for shipped apps
2014-06-13 21:45:31 +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
083cf63cc2
[tx-robot] updated from transifex
2014-06-13 01:54:32 -04:00
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
ecc41fe0c3
Merge pull request #8908 from owncloud/fix-placeholders
...
fix split translations. fix for the discussion in the description
2014-06-10 10:47:23 +02:00
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
e34a8bb9d6
fix hidden user group search field
2014-06-07 21:12:12 +02:00
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
f56b86e857
fix split translations
2014-06-06 15:31:51 +02:00
6f3b95052f
app manager forgets the documentation links
2014-06-06 15:22:02 +02:00
23c83c076c
unify controls bar, remove duplicate from user management
2014-06-06 12:22:09 +02:00
289accc31b
Merge pull request #8159 from owncloud/mobile-sidebar-swipe
...
Mobile sidebar swipe
2014-06-06 11:27:04 +02:00
1745fe1664
Merge pull request #8911 from owncloud/common-lang
...
Add Turkish to common languages
2014-06-06 09:38:10 +02:00
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04: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
11a857f653
Add Turkish to common languages
2014-06-05 22:32:35 +02:00
9063a25bb4
slightly widen sidebar to 250px, works better with apps and on mobile
2014-06-05 21:19:28 +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
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
218131d30d
fix leading decimal Scrutinizer coding style issue
2014-06-05 10:52:06 +02:00
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
39eeb7def9
Merge pull request #8882 from owncloud/remove-placeholdercall
...
remove obsolete placeholder call, fix #8881
2014-06-05 00:07:13 +02:00
e26936e94f
remove obsolete placeholder call, fix #8881
2014-06-04 18:44:12 +02:00
210a1ef7e6
add to app navigation after enabling
2014-06-04 18:22:40 +02:00
71ba457372
personal settings: unbold clients header and remove obsolete CSS
2014-06-04 17:05:44 +02:00
724d027f19
add unit test
2014-06-04 16:29:41 +02:00
bc47e56f9f
fix related layout issues in user management
2014-06-04 16:24:39 +02:00
56a8010c9f
remove console.log in apps.js
2014-06-04 09:51:43 +02:00
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04: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
9396b22fe3
add missing placeholder shim for change password fields in IE8/9
2014-06-03 15:30:10 +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
49f1e4a811
Fix syntax error
2014-06-03 12:42:36 +02:00
0f82b8efb3
Preserve changed groups when switching between apps
2014-06-03 12:42:36 +02:00
953e194245
Dont show group settings for login, filesystem, etc apps after enabling them
2014-06-03 12:42:36 +02:00
e3567242b2
Remove debug statements
2014-06-03 12:42:36 +02:00
7e07ff6f4f
Disable enabling apps by groups for filesystem, authentication and loggin apps
2014-06-03 12:42:36 +02:00
402a31f196
adding some line breaks
2014-06-03 12:42:36 +02:00
7272779456
Prevent js error
2014-06-03 12:42:35 +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
f88482355f
check for user count and files count
2014-06-03 11:39:16 +02:00
5097bcc16d
improve settings name
2014-06-03 11:29:51 +02:00
8e583f55dc
set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app
2014-06-03 11:29:28 +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
eea501b847
various fixes as requested by pr reviewers
2014-06-02 21:39:15 +02:00
f12a5248a3
Merge pull request #8820 from owncloud/design-details
...
Design details
2014-06-02 21:26:43 +02:00
39982c2aea
fix grouplist behaviour (blank after filtering)
2014-06-02 17:32:59 +02:00
bdfad3440c
fix success status symbol to a circle
2014-06-02 17:25:08 +02:00
6f4bdbdb94
Merge pull request #8784 from owncloud/fold-reshare-settings
...
make reshare settings foldable
2014-06-02 14:37:10 +02:00
75cc16f2bd
remove debug output
2014-06-02 12:53:59 +02:00
28a012410a
polish JSDoc
2014-06-02 12:53:59 +02:00
92b8344489
replace setTimeout and clearTimeout handling by _.debounce
2014-06-02 12:53:59 +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
7b63c2c036
cleanup
2014-06-02 12:53:59 +02:00
d030c28d69
bind undo to current deleteHandler
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
fc7438b221
Fix UserList.empty(), use _.defer() instead of setTimeout()
2014-06-02 12:53:58 +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
ad1c34db45
Revisions from review.
...
* Explicit toString()-based getters for uid and displayname data.
* Restored user check for group multiselect in new user creation form.
* Removed jQuery colon expr for uid.
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
f324aa7b24
fix some jshint errors
2014-06-02 12:53:58 +02:00
1abf69893d
user management: display table at full width
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
1ae8ec698b
Make sure group data is returned.
2014-06-02 12:53:57 +02:00
f9f9550969
small fixes / cleanup
2014-06-02 12:53:57 +02:00
f2fed6de4e
Rename $accessiblegroups to $accessibleGroups
2014-06-02 12:53:57 +02:00
8141b9181c
Add space
2014-06-02 12:53:57 +02:00
59fef54e92
Rename $accessibleusers to $accessibleUsers
2014-06-02 12:53:57 +02:00
0067306fd6
Remove uneeded last comma
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
dea7f45782
stick with current group when the filter is used
2014-06-02 12:53:57 +02:00
7b8935abda
show users whose username starts with the search pattern first
...
We may want to switch or extend it to display name. I leave it like this for now, continued work on this needs to have sortable columns in mind
2014-06-02 12:53:56 +02:00
5444a1114d
cleanup
2014-06-02 12:53:56 +02:00
3e411c82a5
unify and consolidate group fetching method for initial template fill and ajax request
2014-06-02 12:53:56 +02:00
d87347e64e
update GroupList when a users is added or removed to a group
2014-06-02 12:53:56 +02:00
3c9788d40c
js cleanup + typos
2014-06-02 12:53:56 +02:00
d779db5aba
js cleanup
2014-06-02 12:53:56 +02:00
08ad073cf5
make string translatable
2014-06-02 12:53:56 +02:00
cbcda49ee3
get translations from settings, not core
2014-06-02 12:53:56 +02:00
249e42c4cd
enable group filtering
2014-06-02 12:53:55 +02:00
dbc854d8b8
Fire up server request only on typing printed or modifying characters and when the string actually changed
2014-06-02 12:53:55 +02:00
8df50acce7
some documentation
2014-06-02 12:53:55 +02:00
68dc665c65
dynamically decide whether to load 10 or 30 users
2014-06-02 12:53:55 +02:00
5b8ba79356
make filter work on server-side
2014-06-02 12:53:55 +02:00
19fd7cd9c7
When emptying a list, a hidden entry remains. If the user uid is the same as of a user being to be loaded, it will not be appended but removed. Thus, add a random user name to avoid such happenings.
2014-06-02 12:53:55 +02:00
5f57d72b93
kick out deprecated and dislodged OC.Router
2014-06-02 12:53:55 +02:00
fe4b1f8b10
Enhancement: Adds Group to grouplist when added via multiselect
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
e159f7e4a9
Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings.
2014-06-02 12:53:55 +02:00
7aca126086
Adds @blizzz to authors
2014-06-02 12:53:54 +02:00
b3d68fc175
refactor delete handling and apply it to users and groups
2014-06-02 12:53:54 +02:00
b6b133237a
Initial Commit with Group Toggle.
2014-06-02 12:53:54 +02:00
cfba7e20cf
don't hide add group when text is entered (except for ESC press)
2014-06-02 12:53:54 +02:00
853ced644d
hide Add Group when clicking away or pressing ESC
2014-06-02 12:53:54 +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
480173569f
put Add Group elements hiding and showing into its own function
2014-06-02 12:53:54 +02:00
330dfeb46b
group name input shall not vanish upon click, plus cleanup (groups do not have home folders)
2014-06-02 12:53:54 +02:00
749afe74df
when clicking on Add Group also put the focus into the group name field
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
506e065f23
stricter test for 0
2014-06-02 12:53:53 +02:00
004dd73c5e
fix user creation, checkSubAdminUser is only available in OC_JSON
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
6526b939d3
Enhancement: Transparency added to icons, changes opacity to 1 on hover.
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
d51b384c0c
Enhancement: Always show edit & delete for the active group.
2014-06-02 12:53:53 +02:00
f946a52819
Rename and Delete Happens only on Active Group.
2014-06-02 12:53:53 +02:00
d650cd66dc
mark selected group active
2014-06-02 12:53:53 +02:00
1f4bc7cb10
port scroll improvements
2014-06-02 12:53:52 +02:00
f7903e92be
do not forget to pass parameters to subtemplate
2014-06-02 12:53:52 +02:00
86d3cf53d1
Let's switch to OCP\JSON
2014-06-02 12:53:52 +02:00
ed1a23c9a2
Use OCP\JSON instead of OC_JSON
2014-06-02 12:53:52 +02:00
8a8800203e
Remove legacy "Check for user comment"
...
I don't think these comments are necessary anymore and therefore they should get killed.
2014-06-02 12:53:52 +02:00
16fb48f2eb
Adds admin check on groupname changes.
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
1734cc09fd
sort groups by user count
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
478393e15a
load groups when clicking on them
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
f751e0bc48
Splits Code for Users and Groups.
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
223e342664
Fixes delete icon only on hover.
2014-06-02 12:52:52 +02:00
78e1b71003
Reverts Bogus Changes.
2014-06-02 12:52:52 +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
b2ca595509
Add GroupList Ajax to Users.
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
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
020255b4e5
add button for properly uninstalling apps
2014-05-31 17:50:39 +02:00
c8636ca4d9
Merge branch 'master' into update_shipped_apps_from_appstore
...
Conflicts:
lib/private/app.php
lib/private/installer.php
2014-05-31 14:55:00 +02:00
2bcfd8e084
make it possible to update shipped apps via the appstore
2014-05-31 12:17:54 +02:00
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04: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
4843d13056
prevent pageload if pressed enter on name email change
2014-05-30 15:12:39 +02:00
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04: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
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
dc83b17f49
Fix double "saved" message when changing email settings
2014-05-28 11:50:55 +02:00
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
e70ed36d8e
Merge pull request #8740 from owncloud/l10n-forgotten-tags
...
reverts 188c543
2014-05-27 14:47:21 +02:00
1a22478446
reverts 188c543 and translates only mail
2014-05-27 12:58:46 +02:00
17276af6ad
Merge pull request #8733 from owncloud/l10n-forgotten-tags
...
unwrapped strings fix
2014-05-27 11:55:33 +02:00
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
188c5435d8
unwrapped strings fix
2014-05-27 03:48:24 +02:00
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
c6c4bb62e1
move saved notification for mail server, so it's smaller
2014-05-23 18:09:45 +02:00
b1ccfcde9e
fix border-radius in settings to 3px
2014-05-23 18:07:25 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
Arthur Schiwon
Jenkins for ownCloud
Volkan Gezer
Vincent Petry
Stephane V
Morris Jobke
Georg Ehrke
Jan-Christoph Borchardt
icewind1991
raghunayyar
Steffen Lindner
Joas Schilling
Morris Jobke
Bjoern Schiessle
Lukas Reschke
Volkan Gezer
Thomas Müller
Bart Visscher
Robin Appelman
Frank Karlitschek
ringmaster