Commit graph

3300 commits

Author SHA1 Message Date
blizzz
6fa609325c Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external
Ajaxify user list for files external
2014-08-28 13:39:21 +02:00
Jenkins for ownCloud
1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Jenkins for ownCloud
2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Clark Tomlinson
c0bc41ff1e Merge pull request #10640 from owncloud/add_moment_js
add moment.js
2014-08-26 13:32:47 -04:00
Georg Ehrke
f82b788ba5 add moment.js 2014-08-26 17:39:15 +02:00
Thomas Müller
3115053bbb Merge pull request #10604 from owncloud/fixing-favicon
Adding type to favicon
2014-08-26 17:35:50 +02:00
Jenkins for ownCloud
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Lukas Reschke
992b0f9b06 Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset
Warn user on resetting passwords via occ when encryption is enabled
2014-08-25 14:23:28 +02:00
Lukas Reschke
f33312f767 Use AppFramework instead of custom controller 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
91ba1b345e add lookup route for displaynames 2014-08-25 11:50:19 +02:00
Jenkins for ownCloud
adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud
70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Clark Tomlinson
e0a8321b23 Adding type to favicon 2014-08-22 16:26:39 -04:00
Thomas Müller
a77d468d35 Merge pull request #10584 from owncloud/simple-wizard-trusted-domains
Add a trusted domain wizard
2014-08-22 17:12:17 +02:00
kondou
b86e124e03 Warn user on resetting passwords via occ when encryption is enabled 2014-08-22 16:15:04 +02:00
Lukas Reschke
4aca46046b Add require_once to update.php due to routing
Fixes https://github.com/owncloud/core/issues/10585
Partially reverts 52d5429768
2014-08-22 11:39:05 +02:00
Jenkins for ownCloud
8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
Lukas Reschke
97b536e3df Add a trusted domain wizard
Adds a little button to the trusted domain warning, if an admin clicks on the warning he will be redirected to ownCloud and asked whether he want to trust this domain.

By far not the cleanest code, or clean at all, but does the job and I don't see a reason to make a lot of changes for this little improvement.
2014-08-21 22:22:35 +02:00
blizzz
52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Vincent Petry
9c980954f4 Merge pull request #10573 from owncloud/share-dropdownfixwhenlinkdisallowed
Fix share dropdown when links are not allowed
2014-08-21 15:32:11 +02:00
Vincent Petry
98d06094e7 Fix share dropdown when links are not allowed
When links are not allowed, the email field does not exist and
autocomplete returns null. This causes Javascript errors.

The fix prevents entering the bogus block when links aren't allowed, as
it doesn't make sense to enter it in such cases anyway.
2014-08-21 13:49:02 +02:00
Jenkins for ownCloud
952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Volker E.
ec1596054f Removing x-webkit-speech attribute #10561
Remove obsolete (from Google Chrome 36 on) attribute due to security vulnerability
2014-08-20 22:59:55 +02:00
Morris Jobke
74af852c34 Merge pull request #10557 from owncloud/better-hover-apps
full opacity for the hovered/focused app as well for better contrast
2014-08-20 22:26:38 +02:00
Jan-Christoph Borchardt
f6c2002554 full opacity for the hovered/focused app as well for better contrast 2014-08-20 19:34:02 +02:00
Morris Jobke
b6d3a6a054 Add note about the term "Cheers" at end of mail
* for translators
* fixes #8689
2014-08-20 15:14:07 +02:00
Jenkins for ownCloud
ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Lukas Reschke
ab12bd292d Add update route to core 2014-08-19 15:40:08 +02:00
Lukas Reschke
29ae7f55ef Remove loadAppScriptFile from the default routes 2014-08-19 15:37:00 +02:00
Robin Appelman
fdfc5c67f8 Merge pull request #9866 from owncloud/app-upgrade
Don't do app upgrades in the background
2014-08-19 13:33:38 +02:00
Jenkins for ownCloud
77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
Vincent Petry
a820df71ee Merge pull request #10339 from owncloud/users-defaultquotafix
Fixed default quota field on user management page
2014-08-18 18:50:43 +02:00
Jan-Christoph Borchardt
58cb0697d6 fix color of links in warnings, fix #10480 2014-08-18 16:40:32 +02:00
Vincent Petry
8995e88e6f Added upgrade notice to avoid timeouts 2014-08-18 15:05:55 +02:00
Jenkins for ownCloud
4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke
69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Morris Jobke
5498186333 Merge pull request #10447 from owncloud/share-foldericonfix
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
Jenkins for ownCloud
c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Lukas Reschke
c1272871a5 Merge pull request #10413 from owncloud/adding-handlebars
Adding handlebars.js
2014-08-15 23:10:11 +02:00
Vincent Petry
607ea636be Fixed folder icon update routine when share owner exists
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Vincent Petry
3c7fbbef22 Do not close container/slider when clicking on single select field 2014-08-15 12:44:00 +02:00
Jan-Christoph Borchardt
61c788f9dc change error text color to white for better contrast, fix #10424 2014-08-15 10:52:45 +02:00
Jenkins for ownCloud
93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Björn Schießle
64c3fe670c Merge pull request #10399 from owncloud/fix_setSendMailStatus
[sharing] fix mail notification
2014-08-14 17:45:39 +02:00
Thomas Müller
561f5d2d45 Adding handlebars.js 2014-08-14 10:43:10 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Bjoern Schiessle
d9f35d8c15 we need the recipient as a additional parameter to know for which share the notification was send 2014-08-13 17:02:51 +02:00