Arthur Schiwon
75cc16f2bd
remove debug output
2014-06-02 12:53:59 +02:00
Arthur Schiwon
28a012410a
polish JSDoc
2014-06-02 12:53:59 +02:00
Arthur Schiwon
92b8344489
replace setTimeout and clearTimeout handling by _.debounce
2014-06-02 12:53:59 +02:00
Arthur Schiwon
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
Arthur Schiwon
7b63c2c036
cleanup
2014-06-02 12:53:59 +02:00
Arthur Schiwon
d030c28d69
bind undo to current deleteHandler
2014-06-02 12:53:59 +02:00
Jan-Christoph Borchardt
29ef2f7a2f
user mgmt: hide group rename function because it’s not supported in the backend yet
2014-06-02 12:53:59 +02:00
ringmaster
fc7438b221
Fix UserList.empty(), use _.defer() instead of setTimeout()
2014-06-02 12:53:58 +02:00
ringmaster
4de14fe6da
Javascript cleanup for groups.
2014-06-02 12:53:58 +02:00
ringmaster
c38548a1aa
Rebase cleanup.
...
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
2014-06-02 12:53:58 +02:00
ringmaster
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
ringmaster
1115d68f25
Fix broken span.
2014-06-02 12:53:58 +02:00
ringmaster
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
ringmaster
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
Thomas Müller
f324aa7b24
fix some jshint errors
2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
1abf69893d
user management: display table at full width
2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
57cc51d21d
user management: remove autocompletion of user/password fields, fix #8464
2014-06-02 12:53:58 +02:00
Jan-Christoph Borchardt
66d00cf782
user management: remove unneeded and erroneous user filter reset function
2014-06-02 12:53:57 +02:00
ringmaster
1ae8ec698b
Make sure group data is returned.
2014-06-02 12:53:57 +02:00
Arthur Schiwon
f9f9550969
small fixes / cleanup
2014-06-02 12:53:57 +02:00
Lukas Reschke
f2fed6de4e
Rename $accessiblegroups to $accessibleGroups
2014-06-02 12:53:57 +02:00
Lukas Reschke
8141b9181c
Add space
2014-06-02 12:53:57 +02:00
Lukas Reschke
59fef54e92
Rename $accessibleusers to $accessibleUsers
2014-06-02 12:53:57 +02:00
Lukas Reschke
0067306fd6
Remove uneeded last comma
2014-06-02 12:53:57 +02:00
Lukas Reschke
b56d14260d
Rename $isadmin to $isAdmin
2014-06-02 12:53:57 +02:00
Arthur Schiwon
a9bd416643
add reset button for the filter field
2014-06-02 12:53:57 +02:00
Arthur Schiwon
3ff123f247
more appropriate label
2014-06-02 12:53:57 +02:00
Arthur Schiwon
dea7f45782
stick with current group when the filter is used
2014-06-02 12:53:57 +02:00
Arthur Schiwon
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
Arthur Schiwon
5444a1114d
cleanup
2014-06-02 12:53:56 +02:00
Arthur Schiwon
3e411c82a5
unify and consolidate group fetching method for initial template fill and ajax request
2014-06-02 12:53:56 +02:00
Arthur Schiwon
d87347e64e
update GroupList when a users is added or removed to a group
2014-06-02 12:53:56 +02:00
Thomas Müller
3c9788d40c
js cleanup + typos
2014-06-02 12:53:56 +02:00
Thomas Müller
d779db5aba
js cleanup
2014-06-02 12:53:56 +02:00
Arthur Schiwon
08ad073cf5
make string translatable
2014-06-02 12:53:56 +02:00
Arthur Schiwon
cbcda49ee3
get translations from settings, not core
2014-06-02 12:53:56 +02:00
Arthur Schiwon
249e42c4cd
enable group filtering
2014-06-02 12:53:55 +02:00
Arthur Schiwon
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
Arthur Schiwon
8df50acce7
some documentation
2014-06-02 12:53:55 +02:00
Arthur Schiwon
68dc665c65
dynamically decide whether to load 10 or 30 users
2014-06-02 12:53:55 +02:00
Arthur Schiwon
5b8ba79356
make filter work on server-side
2014-06-02 12:53:55 +02:00
Arthur Schiwon
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
Arthur Schiwon
5f57d72b93
kick out deprecated and dislodged OC.Router
2014-06-02 12:53:55 +02:00
raghunayyar
fe4b1f8b10
Enhancement: Adds Group to grouplist when added via multiselect
2014-06-02 12:53:55 +02:00
raghunayyar
d3cee79b5a
Enhancement: Adding Group on the Sidebar updates the multiselect on the Userlist.
2014-06-02 12:53:55 +02:00
raghunayyar
e159f7e4a9
Enhancement: Implements Grouplist Toggle, Courtesy Calendar App Settings.
2014-06-02 12:53:55 +02:00
raghunayyar
7aca126086
Adds @blizzz to authors
2014-06-02 12:53:54 +02:00
Arthur Schiwon
b3d68fc175
refactor delete handling and apply it to users and groups
2014-06-02 12:53:54 +02:00
raghunayyar
b6b133237a
Initial Commit with Group Toggle.
2014-06-02 12:53:54 +02:00
Arthur Schiwon
cfba7e20cf
don't hide add group when text is entered (except for ESC press)
2014-06-02 12:53:54 +02:00
Arthur Schiwon
853ced644d
hide Add Group when clicking away or pressing ESC
2014-06-02 12:53:54 +02:00
Arthur Schiwon
a4cfa95545
restructure group.js and put functions to object, also add group list sorting after adding.
2014-06-02 12:53:54 +02:00
Arthur Schiwon
480173569f
put Add Group elements hiding and showing into its own function
2014-06-02 12:53:54 +02:00
Arthur Schiwon
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
Arthur Schiwon
749afe74df
when clicking on Add Group also put the focus into the group name field
2014-06-02 12:53:54 +02:00
Arthur Schiwon
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
raghunayyar
65aa20433c
Enhancement : Toggle Add Group on Click, @blizzz have a look here.
2014-06-02 12:53:53 +02:00
Arthur Schiwon
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
Arthur Schiwon
506e065f23
stricter test for 0
2014-06-02 12:53:53 +02:00
Arthur Schiwon
004dd73c5e
fix user creation, checkSubAdminUser is only available in OC_JSON
2014-06-02 12:53:53 +02:00
Arthur Schiwon
b3221f0e4e
LDAP: adjust main template according to PR 7291
2014-06-02 12:53:53 +02:00
raghunayyar
eed108ec1b
Enhancement : The edit icon looks like files app rename fileaction.
2014-06-02 12:53:53 +02:00
raghunayyar
6526b939d3
Enhancement: Transparency added to icons, changes opacity to 1 on hover.
2014-06-02 12:53:53 +02:00
raghunayyar
ceb6c4df04
Enhancement: Makes Edit and Delete Icons Tapable, 44px by 44px dimensions.
2014-06-02 12:53:53 +02:00
raghunayyar
d51b384c0c
Enhancement: Always show edit & delete for the active group.
2014-06-02 12:53:53 +02:00
raghunayyar
f946a52819
Rename and Delete Happens only on Active Group.
2014-06-02 12:53:53 +02:00
Arthur Schiwon
d650cd66dc
mark selected group active
2014-06-02 12:53:53 +02:00
Arthur Schiwon
1f4bc7cb10
port scroll improvements
2014-06-02 12:53:52 +02:00
Arthur Schiwon
f7903e92be
do not forget to pass parameters to subtemplate
2014-06-02 12:53:52 +02:00
Lukas Reschke
86d3cf53d1
Let's switch to OCP\JSON
2014-06-02 12:53:52 +02:00
Lukas Reschke
ed1a23c9a2
Use OCP\JSON instead of OC_JSON
2014-06-02 12:53:52 +02:00
Lukas Reschke
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
raghunayyar
16fb48f2eb
Adds admin check on groupname changes.
2014-06-02 12:53:52 +02:00
raghunayyar
63645461f0
Fixes Markup in templates.
2014-06-02 12:53:52 +02:00
raghunayyar
9ba4a76214
resolving conflict when picking 8b81a0b
2014-06-02 12:53:52 +02:00
Arthur Schiwon
bf88bd108e
do not show 0 when administered group has no users
2014-06-02 12:53:52 +02:00
Arthur Schiwon
1734cc09fd
sort groups by user count
2014-06-02 12:53:52 +02:00
Arthur Schiwon
7d3ac194e3
do not show 0 when group has no users
2014-06-02 12:53:52 +02:00
Arthur Schiwon
478393e15a
load groups when clicking on them
2014-06-02 12:53:52 +02:00
raghunayyar
e681e1eec0
Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add Group
2014-06-02 12:53:51 +02:00
raghunayyar
f751e0bc48
Splits Code for Users and Groups.
2014-06-02 12:53:51 +02:00
Arthur Schiwon
3a92d48104
reduce template function calls
2014-06-02 12:53:51 +02:00
Arthur Schiwon
57ffaddf26
add Last Login column
2014-06-02 12:53:51 +02:00
raghunayyar
970f899726
Initial Commit : Changes Storage to Quota, Implements GroupName editing.
2014-06-02 12:52:53 +02:00
Arthur Schiwon
dc28f58951
add Storage Location col
2014-06-02 12:52:53 +02:00
raghunayyar
dc1523355b
Adds Admin to Grouplist Everywhere
2014-06-02 12:52:53 +02:00
raghunayyar
4a30665ec3
Removes Delete Icon from Admin Group.
2014-06-02 12:52:53 +02:00
raghunayyar
8e4bbe8297
Adds class button to fix font sizes.
2014-06-02 12:52:53 +02:00
raghunayyar
8e34316e04
Fixes User Search by username.
2014-06-02 12:52:53 +02:00
raghunayyar
c7af9cd6dd
Initial Commit : User Search, Fixes Typos
2014-06-02 12:52:53 +02:00
raghunayyar
223e342664
Fixes delete icon only on hover.
2014-06-02 12:52:52 +02:00
raghunayyar
78e1b71003
Reverts Bogus Changes.
2014-06-02 12:52:52 +02:00
raghunayyar
71160ff853
Deletes Group Clientside Effectively.
2014-06-02 12:52:52 +02:00
raghunayyar
ce46cd3680
Implements Group Creation from Sidebar
2014-06-02 12:52:52 +02:00
raghunayyar
b506388b75
Reverts last commit, implements user in group count.
2014-06-02 12:52:52 +02:00
raghunayyar
b2ca595509
Add GroupList Ajax to Users.
2014-06-02 12:52:52 +02:00
raghunayyar
43ced8c6c7
Splits Controls overlap in files and users.
2014-06-02 12:52:52 +02:00
raghunayyar
0663d954e6
resolve conflicts while picking c0fb623
2014-06-02 12:52:52 +02:00
Jenkins for ownCloud
d39216c5e7
[tx-robot] updated from transifex
2014-06-02 01:54:37 -04:00
Jenkins for ownCloud
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
Georg Ehrke
020255b4e5
add button for properly uninstalling apps
2014-05-31 17:50:39 +02:00
Georg Ehrke
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
Georg Ehrke
2bcfd8e084
make it possible to update shipped apps via the appstore
2014-05-31 12:17:54 +02:00
Jenkins for ownCloud
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
Thomas Müller
555b9cc245
Merge pull request #7614 from owncloud/test_annotations_working
...
Check if ReflectionMethod::getDocComment is working
2014-05-30 22:17:30 +02:00
Volkan Gezer
4843d13056
prevent pageload if pressed enter on name email change
2014-05-30 15:12:39 +02:00
Jenkins for ownCloud
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
Lukas Reschke
5cd0fd2559
Merge pull request #8700 from owncloud/design-smallfixes
...
Design detail fixes
2014-05-29 21:54:15 +02:00
Volkan Gezer
c01f196f72
make reshare settings foldable
2014-05-29 21:14:20 +02:00
Jenkins for ownCloud
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
Joas Schilling
dc83b17f49
Fix double "saved" message when changing email settings
2014-05-28 11:50:55 +02:00
Jenkins for ownCloud
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
Volkan Gezer
e70ed36d8e
Merge pull request #8740 from owncloud/l10n-forgotten-tags
...
reverts 188c543
2014-05-27 14:47:21 +02:00
Volkan Gezer
1a22478446
reverts 188c543
and translates only mail
2014-05-27 12:58:46 +02:00
Vincent Petry
17276af6ad
Merge pull request #8733 from owncloud/l10n-forgotten-tags
...
unwrapped strings fix
2014-05-27 11:55:33 +02:00
Jenkins for ownCloud
a756666585
[tx-robot] updated from transifex
2014-05-27 01:54:54 -04:00
Volkan Gezer
188c5435d8
unwrapped strings fix
2014-05-27 03:48:24 +02:00
Jenkins for ownCloud
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
Jenkins for ownCloud
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
Jenkins for ownCloud
2afdd1bf1a
[tx-robot] updated from transifex
2014-05-24 01:55:34 -04:00
Jan-Christoph Borchardt
c6c4bb62e1
move saved notification for mail server, so it's smaller
2014-05-23 18:09:45 +02:00
Jan-Christoph Borchardt
b1ccfcde9e
fix border-radius in settings to 3px
2014-05-23 18:07:25 +02:00
Bjoern Schiessle
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
Jenkins for ownCloud
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
Thomas Müller
30f1ec2521
Merge branch 'master' into test_annotations_working
...
Conflicts:
lib/private/util.php
2014-05-19 21:42:30 +02:00
Jenkins for ownCloud
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
Jenkins for ownCloud
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
Björn Schießle
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
Bjoern Schiessle
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
Vincent Petry
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
Jenkins for ownCloud
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
Vincent Petry
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
Vincent Petry
3daaf6ba4f
Merge pull request #8597 from owncloud/l10n-fix-typo
...
fix typo encryption
2014-05-15 10:05:37 +02:00
Jenkins for ownCloud
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
Volkan Gezer
5291f47c66
fix typo encryption
2014-05-15 01:29:14 +02:00
Björn Schießle
dab3cb65cf
Merge pull request #8522 from owncloud/sharing_ux_improvements
...
Sharing ux improvements
2014-05-14 12:54:27 -04:00
Björn Schießle
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Bjoern Schiessle
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
Bjoern Schiessle
ec045b251c
hide input field if default expire date isn't activated
2014-05-13 11:28:25 +02:00
Thomas Müller
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
Jenkins for ownCloud
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
Jenkins for ownCloud
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
Thomas Müller
b7981910f7
adopt new settings style
2014-05-09 22:53:01 +02:00
Thomas Tanghus
287c8981bc
Check if ReflectionMethod::getDocComment is working
2014-05-09 22:44:55 +02:00
Jenkins for ownCloud
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
Jenkins for ownCloud
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04:00
Jenkins for ownCloud
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
Jenkins for ownCloud
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
Jenkins for ownCloud
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
Thomas Müller
e27dc5b6f9
Merge pull request #8309 from DavidPrevot/chosen
...
Adapt chosen (css) path
2014-04-28 12:34:40 +02:00
Jenkins for ownCloud
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
Jenkins for ownCloud
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
Jenkins for ownCloud
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
Volkan Gezer
ad1265da13
typo fix, by translators on transifex
2014-04-25 16:26:30 +02:00
Jenkins for ownCloud
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
Bjoern Schiessle
6650be9913
add setting to set default expire date
2014-04-24 13:34:31 +02:00
Jenkins for ownCloud
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
Jenkins for ownCloud
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
David Prévot
eebb756c38
Adapt chosen (css) path
...
Avoid shipping duplicate files in 3rdparty/css.
3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png
so its useless to duplicate them in 3rdparty/css.
Taking the same approach as in apps/calendar/appinfo/app.php and
apps/files_external/settings.php.
2014-04-22 14:15:09 -04:00
Thomas Müller
54476c468c
fix spelling 'Allow user ...' -> 'Allow users ...'
2014-04-22 09:34:08 +02:00
Jenkins for ownCloud
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
Lukas Reschke
e88731a477
Some more PHPDoc fixes
2014-04-21 15:44:54 +02:00
Jenkins for ownCloud
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
Lukas Reschke
eecd4bd18e
Use JS as content-type due to mimesniffing
2014-04-17 10:40:19 +02:00
Jenkins for ownCloud
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
Volkan Gezer
1903895172
Make email display name change translatable again
2014-04-15 00:27:54 +02:00
Jenkins for ownCloud
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
Jenkins for ownCloud
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
Björn Schießle
10dc1de644
Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app
...
Fix some localization issues with file encryption/decryption strings
2014-04-11 17:22:13 +02:00
Jenkins for ownCloud
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
Joas Schilling
e79a027e77
Always define sendmail_is_available
...
Fix #8048
2014-04-09 10:18:46 +02:00
Jenkins for ownCloud
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
Jenkins for ownCloud
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
Thomas Müller
647abe512b
reduce code duplication, fix parse error, prevent page reload on hitting enter while changing the display name - refs #8085
2014-04-07 14:04:16 +02:00
Jenkins for ownCloud
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
Volkan Gezer
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
Lukas Reschke
33a2aa8865
Delete oauth.css
2014-04-04 22:38:16 +02:00
Lukas Reschke
b2f8e34388
Remove uneeded file
...
This file seems not to be actually used anywhere.
2014-04-04 22:14:51 +02:00
Jenkins for ownCloud
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
Thomas Müller
20f26068e7
Merge pull request #7476 from owncloud/type-hinting
...
Type hinting
2014-04-03 20:02:27 +02:00
Jan-Christoph Borchardt
5301056ab1
fix h3 style, move out from settings to apps CSS
2014-04-02 09:18:33 +02:00
Jenkins for ownCloud
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
Morris Jobke
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
blizzz
a179335775
Merge pull request #7940 from owncloud/settings-userlistajaxcallfix
...
Fixed user list offset call
2014-04-01 14:17:05 +02:00
Vincent Petry
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
Vincent Petry
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
Jenkins for ownCloud
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
Bart Visscher
6b061c236d
Merge branch 'master' into type-hinting
...
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
2014-03-31 21:38:54 +02:00
Thomas Müller
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
Morris Jobke
ab696edba6
Merge pull request #7916 from owncloud/fix-input-sizes
...
Fix input sizes
2014-03-31 15:56:19 +02:00
Jan-Christoph Borchardt
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
raghunayyar
881c66df52
Removes highlighting of selected items, padding from apps management.
2014-03-30 15:48:47 +05:30
Jenkins for ownCloud
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
Jenkins for ownCloud
915fa3da74
[tx-robot] updated from transifex
2014-03-29 01:55:44 -04:00
Vincent Petry
82f98fb3d3
Fixed user list offset call
2014-03-28 18:12:34 +01:00
Thomas Müller
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
Jenkins for ownCloud
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
Jan-Christoph Borchardt
53b1e4a00b
remove additional radio button width declaration
2014-03-27 17:13:12 +01:00
Jan-Christoph Borchardt
5b2abb32a6
remove CSS rules for personalblock, remove it from core
2014-03-27 17:00:47 +01:00