Commit Graph

15272 Commits

Author SHA1 Message Date
Vincent Petry a1d2f0f516 Merge pull request #6094 from owncloud/enc_fix_reshares
fix path reconstruction for reshares
2013-11-28 01:41:34 -08:00
Thomas Müller f23d641b82 Merge pull request #6084 from owncloud/fix-app-routing
fix custom routes defined by apps
2013-11-28 00:00:09 -08:00
Bjoern Schiessle efe7c4075a fix path reconstruction for reshares 2013-11-27 23:26:04 +01:00
Morris Jobke 54b24ca88d Merge pull request #6048 from owncloud/encryption_initial_enc_indicator
show a message at the log-in screen if inital encryption take place
2013-11-27 14:10:11 -08:00
Morris Jobke 55d7cf8ffd improve encryption message 2013-11-27 23:07:19 +01:00
Bjoern Schiessle d9729168f9 some small js fixes 2013-11-27 22:42:03 +01:00
Bjoern Schiessle 0219b8b3b9 add spinner to the template so that it can be loaded in time 2013-11-27 22:36:47 +01:00
Bjoern Schiessle e0924a5f07 switch to large spinner 2013-11-27 21:58:38 +01:00
Robin Appelman 885d04bc86 Fix getRawPathInfo for the '/' edge case 2013-11-27 21:28:54 +01:00
Björn Schießle 5295993144 Merge pull request #6088 from owncloud/fix_public_previews
fix public preview creation if a user is logged in
2013-11-27 11:05:27 -08:00
Björn Schießle 34a8c3c4cd Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
move files to owners trash
2013-11-27 10:24:55 -08:00
Bjoern Schiessle aee7781f22 fix public preview creation if a user ios logged in 2013-11-27 18:44:01 +01:00
Morris Jobke 39f9e16f20 Merge pull request #6086 from owncloud/incognito_mode
return false if user is in incognito mode
2013-11-27 09:11:18 -08:00
Jenkins for ownCloud 4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
Vincent Petry d2840a045d Fixed sharing hook to not remove the share before the trashbin
Fixed the hook order between sharing app and trashbin
2013-11-27 17:22:48 +01:00
Bjoern Schiessle 1536c7ea58 switch from "name" attribute to "id" 2013-11-27 17:01:21 +01:00
Bjoern Schiessle 6deda1b9f6 return false if user is in incognito mode 2013-11-27 16:52:30 +01:00
Bjoern Schiessle 1065c33543 Merge branch 'master' into encryption_initial_enc_indicator 2013-11-27 16:44:06 +01:00
Vincent Petry 40231c08cf Merge pull request #5977 from owncloud/encryption_enable_public_upload
Encryption enable public upload
2013-11-27 07:39:03 -08:00
Robin Appelman c47e46fda0 fix custom routes defined by apps 2013-11-27 15:35:49 +01:00
Bjoern Schiessle 060e0ad0cd with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter 2013-11-27 15:35:32 +01:00
Bjoern Schiessle 9fb71af988 Merge branch 'master' into encryption_enable_public_upload
Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
Thomas Müller 5b7b053634 Merge pull request #5976 from owncloud/encryption_work_with_public_gallery
Encryption work with public gallery
2013-11-27 04:25:54 -08:00
Bjoern Schiessle 7f2bdb0e97 typo fixed 2013-11-27 12:25:04 +01:00
Bjoern Schiessle 7f3b178d73 some small changes according to the review comments 2013-11-27 11:46:24 +01:00
Morris Jobke a81909097c Merge pull request #6027 from owncloud/public-api-restful-routing-oc6
fix appframework routing
2013-11-27 01:55:52 -08:00
Morris Jobke 7755e69af0 add PHPDoc for urlParams 2013-11-27 10:55:06 +01:00
blizzz 34704eded6 Merge pull request #5955 from owncloud/fix5863
LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input
2013-11-27 00:30:15 -08:00
Thomas Müller af46d99730 Merge pull request #6075 from owncloud/ssl-warning
add warning for HTTP connection
2013-11-27 00:29:04 -08:00
Thomas Müller 3456109916 Merge pull request #6071 from owncloud/db-documentation
Add some documentation to db_structure.xml
2013-11-27 00:28:03 -08:00
Morris Jobke 8506d2bf42 fix wording 2013-11-27 00:38:56 +01:00
Morris Jobke 2d822e3b95 add warning for HTTP connection 2013-11-27 00:05:48 +01:00
Andreas Fischer 0013e2e6a8 Fix spacing. 2013-11-26 22:16:14 +01:00
Andreas Fischer 68986f5272 db-doc: privatedata description 2013-11-26 22:13:01 +01:00
Andreas Fischer 2714a22ba8 db-doc: vcategory* descriptions 2013-11-26 22:06:20 +01:00
Andreas Fischer ab773650cd db-doc: users description 2013-11-26 21:53:55 +01:00
Andreas Fischer bc77ba1d4c db-doc: jobs description 2013-11-26 21:52:30 +01:00
Andreas Fischer 8cde5e80f6 db-doc: share description 2013-11-26 21:48:31 +01:00
Andreas Fischer f4031d4320 db-doc: properties description 2013-11-26 21:23:57 +01:00
Andreas Fischer 035199acab db-doc: preferences description 2013-11-26 21:18:42 +01:00
Andreas Fischer 5450d166b0 db-doc: locks description 2013-11-26 21:15:23 +01:00
Andreas Fischer 466e8985a8 db-doc: groups description 2013-11-26 21:14:52 +01:00
blizzz 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
Andreas Fischer 43f0e30315 db-doc: group_admin reduction note 2013-11-26 20:55:19 +01:00
Andreas Fischer 790155e574 db-doc: group_admin description 2013-11-26 20:55:08 +01:00
Andreas Fischer 46e32b08c0 db-doc: group_user description 2013-11-26 20:50:21 +01:00
Andreas Fischer 6da5b05176 Remove the dbprefix from comments. It has no information. 2013-11-26 20:42:15 +01:00
Andreas Fischer d083108e72 db-doc: permissions description 2013-11-26 20:41:05 +01:00
Andreas Fischer ea26282493 Prettier ASCII lists. ^^ 2013-11-26 20:27:51 +01:00
Andreas Fischer 421a1e69dc db-doc: filecache description 2013-11-26 20:27:18 +01:00