wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31945 commits 157 branches 562 tags 714 MiB
Commit graph

5355 commits

Author SHA1 Message Date
Jenkins for ownCloud
6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
Jenkins for ownCloud
cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Thomas Müller
4b2544925f Merge pull request #23844 from owncloud/disable-user 
Add occ commands to enable and disable a user + a disabled user can n…
 2016-05-03 15:22:41 +02:00
Lukas Reschke
df2eb96cc4 Merge pull request #24389 from owncloud/login-by-email 
Allow login by email address
 2016-05-03 13:44:38 +02:00
Roeland Jago Douma
fc82047e26
Move OC_Log_xx to \OC\Log namespace 2016-05-03 08:57:26 +02:00
Jenkins for ownCloud
1974ae8da7 [tx-robot] updated from transifex 2016-05-03 01:57:34 -04:00
Thomas Müller
7aca13f14c
Allow login by email address 2016-05-02 14:51:01 +02:00
Thomas Müller
9c9fec36dd
Add occ commands to enable and disable a user + a disabled user can no longer login - fixes #23838 2016-05-02 09:31:22 +02:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Jenkins for ownCloud
023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Thomas Müller
7ad1d491f4
Adding progress to occ upgrade 2016-04-28 13:52:01 +02:00
Thomas Müller
821d8736c8
Adding progress to web upgrade 2016-04-28 13:52:01 +02:00
Thomas Müller
cdcd49b473
Adding progress to occ maintenance:repair 2016-04-28 13:52:01 +02:00
Jenkins for ownCloud
ba0099f73a [tx-robot] updated from transifex 2016-04-28 01:55:14 -04:00
Thomas Müller
20602ff36a Merge pull request #21417 from J0WI/css-fixes 
css fallbacks and code style fixes
 2016-04-27 09:47:36 +02:00
Jenkins for ownCloud
2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Jenkins for ownCloud
dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Jenkins for ownCloud
4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Thomas Müller
48b61b7b5a
Deprecate appinfo/update.php - RepairSteps within info.xml are to be used 2016-04-22 17:22:40 +02:00
Björn Schießle
606b756a94 Merge pull request #23918 from owncloud/cruds-for-federated-shares 
bring back CRUDS permissions for federated shares
 2016-04-22 14:50:42 +02:00
Thomas Müller
cc4efc4c03 Merge pull request #24085 from owncloud/feedback-on-app-migrations 
App migration steps need to push feedback to the user ....
 2016-04-22 14:39:11 +02:00
Lukas Reschke
2c4ef37025 Merge pull request #24126 from owncloud/err-reload-delay 
Delay reloading the page if an ajax error occurs, show notification
 2016-04-22 11:23:39 +02:00
Thomas Müller
3aa77960ef
Adding pre- and post-migration repair steps 2016-04-22 09:26:31 +02:00
Thomas Müller
d0030aad6c
Remove deprecated HTTPHelper from InfoParser 2016-04-22 08:38:41 +02:00
Jenkins for ownCloud
ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Thomas Müller
e673ff0f33 Merge pull request #24138 from owncloud/revert-22760-tooltip-cssfix 
Revert "add word wrap to tooltips. Fixes #22746"
 2016-04-21 12:52:50 +02:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Lukas Reschke
e977a24ba1 Revert "add word wrap to tooltips. Fixes #22746" 2016-04-20 23:13:07 +02:00
Robin McCorkell
62024d74d4 Add test for reload delay 2016-04-20 22:09:59 +01:00
Thomas Müller
7e2a1656f9 Merge pull request #24132 from owncloud/fix-web-updater 
Fix web updater
 2016-04-20 21:50:00 +02:00
Morris Jobke
6b66f2dfb4 Merge pull request #23990 from owncloud/heartbeat-debounce 
Debounce heartbeat ajax calls to lower the number of requests
 2016-04-20 21:23:10 +02:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Thomas Müller
22db0f17a8 Fix web updater - fixes #24115 2016-04-20 20:32:47 +02:00
Björn Schießle
2a6a336e87
always share with same default permissions, no special handling for remote shares 2016-04-20 17:47:33 +02:00
Robin McCorkell
bd9a380d53 Delay reloading the page if an ajax error occurs, show notification 2016-04-20 16:31:04 +01:00
Jan-Christoph Borchardt
5fe630c4f1 Merge pull request #23980 from owncloud/remember-email-when-setting-expirationdate 
remember email when setting expiration date
 2016-04-20 11:42:02 +02:00
Jenkins for ownCloud
a296cbd203 [tx-robot] updated from transifex 2016-04-20 01:54:55 -04:00
Christoph Wurst
e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') 2016-04-19 16:20:17 +02:00
Thomas Müller
b441d3dcb3 Merge pull request #24062 from owncloud/fix-gitignore 
Fix gitignore for core/vendor
 2016-04-19 16:06:59 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Roeland Douma
0c5f915377 Merge pull request #24054 from owncloud/data_fingerprint 
Add data-fingerprint property
 2016-04-19 14:24:27 +02:00
Christoph Wurst
59e268763c
remove deprecated jQuery.browser 2016-04-19 11:55:40 +02:00
Christoph Wurst
e7f07ba02e
extract mail view for sending share invitations 
fixes #22947
 2016-04-19 11:37:23 +02:00
Thomas Müller
7186975e35 Merge pull request #23993 from owncloud/update-to-jquery2 
Update jquery to version 2.2.3
 2016-04-19 10:26:08 +02:00
Jenkins for ownCloud
f812f51c5d [tx-robot] updated from transifex 2016-04-19 01:55:59 -04:00
Thomas Müller
00ad23f3c1 Merge pull request #24049 from owncloud/skjnldsv-fix-colors-values 
Fix rgb values
 2016-04-19 06:59:14 +02:00
Lukas Reschke
8222ad5157
Move logout to controller 
Testable code. Yay.
 2016-04-18 21:21:52 +02:00