Commit Graph

15313 Commits

Author SHA1 Message Date
blizzz 64e9a1aec0 Merge pull request #3176 from nextcloud/default-value-datadir
Add proper default value for datadir
2017-01-30 13:01:24 +01:00
Nextcloud bot bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Nextcloud bot f4de328695
[tx-robot] updated from transifex 2017-01-29 01:06:55 +00:00
Nextcloud bot b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Morris Jobke 8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml
Add navigation via info.xml (#26785)
2017-01-27 11:25:26 -06:00
Joas Schilling 27f8a832e4
Force to specify the name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-27 09:44:11 +01:00
Nextcloud bot a5aeddc810
[tx-robot] updated from transifex 2017-01-27 01:07:18 +00:00
Morris Jobke 426c8e3be1 Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bug
fix shared-as-busy events for owner
2017-01-26 17:30:51 -06:00
Lukas Reschke dd0d469833 Merge pull request #3272 from nextcloud/fix_user_controller
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
2017-01-26 18:37:36 +01:00
Roeland Jago Douma ce240a45e6 Merge pull request #3160 from nextcloud/streams52
update icewind/streams to 0.5.2
2017-01-26 14:55:37 +01:00
Robin Appelman c9ecd64d36
update icewind/streams to 0.5.2
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-26 12:19:32 +01:00
Georg Ehrke 97d3020027
fix shared-as-busy events for owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-01-26 12:06:07 +01:00
Lukas Reschke 3afd3c3a3d Merge pull request #3265 from nextcloud/brute-force-protection-public-link-auth
add brute force protection for public link authentication
2017-01-26 12:05:16 +01:00
Bjoern Schiessle 3e6c40eeb4
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:31:08 +01:00
Morris Jobke 3a603ab8b4 Merge pull request #3264 from nextcloud/ldap-deny-long-dns
Gracefully deny users or groups with too long DNs
2017-01-26 01:15:43 -06:00
Morris Jobke feab1e5b94 Merge pull request #3162 from nextcloud/ldap-ocs
Part 1 of LDAP Backend OCS Api
2017-01-25 22:45:34 -06:00
Nextcloud bot 05e3aa491a
[tx-robot] updated from transifex 2017-01-26 01:07:15 +00:00
Morris Jobke 6fe3cfa1e3 Merge pull request #3244 from nextcloud/settings-icon
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06:00
Bjoern Schiessle ed55b87b65
add brute force protection for public link authentication
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 18:17:08 +01:00
Arthur Schiwon 03ae7b654f
Gracefully deny users or groups with too long DNs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-01-25 17:10:51 +01:00
Björn Schießle ffe2543a57 Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api
add data from the users profile to the provisioning api
2017-01-25 15:44:36 +01:00
Björn Schießle 5873a0a7d4 Merge pull request #3231 from nextcloud/allow-editing-public-links
allow editing single files shared as public link
2017-01-25 15:35:57 +01:00
Joas Schilling 95ef625a9d
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-25 11:24:42 +01:00
Bjoern Schiessle 5086335643
unify endpoints form core and the the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 11:20:35 +01:00
Nextcloud bot c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke f9c3639607
add icon for encryption settings on personal page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:59:36 -06:00
Morris Jobke e46410e856
Add icon to admin page sidebar for LDAP
* follow up to nextcloud/server#3151

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:54:32 -06:00
Morris Jobke e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons
add icons to navigation of personal & admin settings
2017-01-24 10:56:31 -06:00
Bjoern Schiessle fee42647fb
add data from the users profile to the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 14:23:18 +01:00
Bjoern Schiessle 92d7dd4781
allow editing single files shared as public link
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 13:41:27 +01:00
Nextcloud bot 30e9d67ee9
[tx-robot] updated from transifex 2017-01-24 01:07:14 +00:00
Morris Jobke f19feccf9f Merge pull request #3209 from nextcloud/fix-theming-typo
Fix typo in theming description
2017-01-23 13:54:52 -06:00
Morris Jobke 9b0c6c0eff Merge pull request #3157 from nextcloud/fcloseafterkill
[uc] Prevent PHP request to get killed when using fclose callback (#26775)
2017-01-23 13:51:43 -06:00
Morris Jobke 30c32e0b16 Merge pull request #3220 from nextcloud/direct-link-open-sidebar
open the sidebar when opening a permalink
2017-01-23 12:57:52 -06:00
Morris Jobke d80bc6c72b Merge pull request #2924 from nextcloud/flexbox-header
Use flexbox for header and rearrange some elements
2017-01-23 12:16:27 -06:00
Robin Appelman 0f698e2021
open the sidebar when opening a permalink
Also works for search results

Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-23 18:06:24 +01:00
Joas Schilling 4bb8731089
Fix typo in theming description
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-23 12:35:58 +01:00
Vincent Petry 0aaf209c66
Prevent PHP request to get killed when using fclose callback (#26775)
* Prevent PHP request to get killed when using fclose callback

* Add ignore_user_abort everywhere where the time limit is set to 0

Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-01-23 12:33:20 +01:00
Joas Schilling 5d486478d3 Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-group
Subadmin check on removing user from group
2017-01-23 12:10:06 +01:00
Christoph Wurst 47c63e6a3e
fix public sharing buttons
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:08:10 +01:00
Christoph Wurst a1f9425e65
fix log and app name
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
Christoph Wurst bfa50a4444
more cleanup
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-23 09:06:45 +01:00
Morris Jobke 16afaa783b Merge pull request #3118 from nextcloud/newFileMenu-css-guidelines
Fit newFileMenu to css guidelines
2017-01-22 20:39:16 -06:00
Nextcloud bot 8024f5a17f
[tx-robot] updated from transifex 2017-01-23 00:17:39 +00:00
John Molakvoæ 7eec5e0c27 Merge pull request #3190 from nextcloud/fix-sharing-popover
Fix #3174
2017-01-22 20:40:48 +01:00
John Molakvoæ (skjnldsv) 0fc0bcf6b3
Popover newFolder input fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv) 3d86275f1e
Popover positionning fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:09 -06:00
John Molakvoæ (skjnldsv) 961fcfa1fb
Popover positionning and classes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:08 -06:00
John Molakvoæ (skjnldsv) 418ebfbdf4
fit newFileMenu to css guidelines
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-01-22 11:45:08 -06:00
Morris Jobke 0d6e3ca86b Merge pull request #3187 from nextcloud/inputs-scss-optimisation
Inputs.scss rewritting and optimisation
2017-01-22 11:41:49 -06:00