status-im
/
open-bounty
mirror of https://github.com/status-im/open-bounty.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,008 Commits 65 Branches 0 Tags 6.8 MiB
Commit Graph

1008 Commits

Author SHA1 Message Date
Ivan Grishaev 9732b7c948 193 h3 added 2018-02-12 18:17:45 +03:00
Ivan Grishaev 092713a541 193 merge artifacts 2018-02-12 18:13:55 +03:00
Ivan Grishaev 34c16456ea Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-12 18:12:01 +03:00
Ivan Grishaev 4717a1a590 193 review fixes 2018-02-12 18:07:41 +03:00
Vitaliy Vlasov c3798e98d9
Merge branch 'develop' into fix/metamask-address-not-updated-#187 2018-02-12 15:37:05 +02:00
P 0b0fb50aac
Merge pull request #265 from status-im/develop 
Develop to master
 2018-02-12 12:28:45 +01:00
Vitaliy Vlasov aa34903725
Merge pull request #266 from status-im/revert-260-revert-251-revert-240-fix/metamask-address-not-updated-#187 
Revert "[FIX #187] Fix address dropdown in My Payment Details"
 2018-02-09 15:57:51 +02:00
Vitaliy Vlasov caca11a37b
Revert "Revert "Revert "[FIX #187] Fix address dropdown in My Payment Details""" 2018-02-09 15:57:19 +02:00
Vitaliy Vlasov 5e8cb562b7 Remove trailing conflict marker 2018-02-09 15:39:08 +02:00
Vitaliy Vlasov 186d989006 Merge branch 'develop' into fix/metamask-address-not-updated-#187 2018-02-09 15:36:02 +02:00
Ivan Grishaev c2d6094dad Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-09 16:20:13 +03:00
P 8dd2a4f2ef
Merge pull request #261 from pablodip/add-cider-dependency-temporatily 
Remove Cider
 2018-02-08 20:39:15 +01:00
Vitaliy Vlasov 8b0622480d Add :user-profile-loaded? event/sub 2018-02-08 18:08:44 +02:00
P abaf5b3b31
Merge pull request #256 from pablodip/sort-and-filter-fixes-3 
Sort and filter fixes 3
 2018-02-08 16:30:50 +01:00
pablodip 177b0b22c7 remove cider in dependencies and code 2018-02-08 13:50:28 +01:00
Ivan Grishaev 21c869af49 193 blank line removed 2018-02-08 15:33:24 +03:00
Ivan Grishaev 56d1425b17 193 sql fix 2018-02-08 15:29:26 +03:00
Ivan Grishaev c66691ca23 193 review fixes 2018-02-08 15:27:46 +03:00
P 76ce98eca4
Merge pull request #257 from pablodip/missing_font_files 
Add missing font files in resources
 2018-02-08 13:04:49 +01:00
Ivan Grishaev 596e6c9439 Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-08 12:54:18 +03:00
Vitaliy Vlasov 4451c43788
Merge pull request #260 from status-im/revert-251-revert-240-fix/metamask-address-not-updated-#187 
Revert "Revert "[FIX #187] Fix address dropdown in My Payment Details""
 2018-02-08 11:31:56 +02:00
Vitaliy Vlasov 27d189f1bc
Revert "Revert "[FIX #187] Fix address dropdown in My Payment Details"" 2018-02-08 11:31:46 +02:00
pablodip 439c237336 disable filters and sorting in windows for now 2018-02-07 21:22:38 +01:00
pablodip 65a357dcd9 add top border in the first item in bounties, and adjust above info 2018-02-07 21:06:58 +01:00
pablodip 22a7939363 move sorting to align it with items count 2018-02-07 21:02:40 +01:00
pablodip 37aefc2d1a make right column narrower 2018-02-07 20:46:57 +01:00
pablodip 92dd80e7be fix z-index for events in safari 2018-02-07 20:40:39 +01:00
P fb46b66979
Merge pull request #254 from pablodip/sort-and-filter-fixes-2 
Sorting and filtering fixes 2
 2018-02-07 15:20:26 +01:00
pablodip 1a4aec81d7 fix some visual issues in filters 2018-02-07 12:23:44 +01:00
Tetiana Churikova f7f3795274
Merge pull request #239 from status-im/tests/git-fork-repo 
BaseTestCase refactoring
 2018-02-07 12:30:48 +02:00
Ivan Grishaev a61885d5be 193 get rid of passing user-id 2018-02-07 11:33:48 +03:00
Ivan Grishaev a0073b295e Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-06 20:13:15 +03:00
Ivan Grishaev b162bba9b3 193 config file restored 2018-02-06 20:10:08 +03:00
Ivan Grishaev c860db533a 193 config.example deleted 2018-02-06 20:08:23 +03:00
Ivan Grishaev fb95fe6697 193 print removed 2018-02-06 20:01:19 +03:00
Ivan Grishaev 6107fec01d 193 gitignore fix 2018-02-06 19:58:48 +03:00
Ivan Grishaev 2b7dff9648 193 UI updated 2018-02-06 19:58:39 +03:00
Ivan Grishaev 8937816a8c 193 query field updated 2018-02-06 19:58:26 +03:00
Vitaliy Vlasov 560cd6a964 [FIX #154] Increase padding for open-claims-label 2018-02-06 16:45:15 +02:00
Vitaliy Vlasov 1759ef4ca8
Merge pull request #251 from status-im/revert-240-fix/metamask-address-not-updated-#187 
Revert "[FIX #187] Fix address dropdown in My Payment Details"
 2018-02-06 16:32:01 +02:00
Vitaliy Vlasov 2ca563ab1a
Revert "[FIX #187] Fix address dropdown in My Payment Details" 2018-02-06 16:31:46 +02:00
Vitaliy Vlasov 83d37cd5e9
Merge pull request #240 from status-im/fix/metamask-address-not-updated-#187 
[FIX #187] Fix address dropdown in My Payment Details
 2018-02-06 16:21:35 +02:00
Ivan Grishaev 50e3045a2c 193 address + hidden routes mixed 2018-02-06 17:09:28 +03:00
Ivan Grishaev 07bb457dfa 193 user exists query added 2018-02-06 17:09:08 +03:00
P 5a99979a7c
Merge pull request #247 from pablodip/unversioned-config-files 
Unversioned config files
 2018-02-06 14:14:25 +01:00
Churikova Tetiana ccf3fcc485 add ability to delete fork; 
rework BaseTestCase to use 2 drivers and setup\teardown classmethods;
move all preconditions for tests to setup\teardown classmethods.
 2018-02-06 12:58:13 +02:00
Ivan Borovkov 9f1f04c3d6
fix named branches in jenkinsfile (#249) 2018-02-06 12:29:17 +02:00
Ivan Borovkov 3d454c9f8d
jenkinsfile v1 (#229) 
* jenkinsfile v1

* call another job to roll out
 2018-02-06 12:18:31 +02:00
Vitaliy Vlasov 6cd1f93110
Merge pull request #244 from status-im/fix/include-wkhtmltoimage-doc-#233 
[FIX #233] Include wkhtmltopdf reference
 2018-02-05 18:57:57 +02:00
P ce77b6a9ba
Merge pull request #245 from pablodip/sort-and-filter-fixes 
Sorting and filtering fixes
 2018-02-05 17:38:05 +01:00